From 00baaffb97ebd66fb5179cca8da8c8a7d50c7a09 Mon Sep 17 00:00:00 2001
From: dante ruiz <dante@highfidelity.io>
Date: Fri, 7 Jun 2019 10:56:44 -0700
Subject: [PATCH] allow launcher to work from mounted dmg

---
 launchers/darwin/src/DownloadInterface.m |  2 ++
 launchers/darwin/src/Launcher.h          |  1 +
 launchers/darwin/src/Launcher.m          | 11 +++++++----
 launchers/darwin/src/main.mm             |  2 +-
 4 files changed, 11 insertions(+), 5 deletions(-)

diff --git a/launchers/darwin/src/DownloadInterface.m b/launchers/darwin/src/DownloadInterface.m
index b957197567..ed7aaf51c4 100644
--- a/launchers/darwin/src/DownloadInterface.m
+++ b/launchers/darwin/src/DownloadInterface.m
@@ -46,6 +46,8 @@
     NSString* downloadFileName = [sharedLauncher getDownloadFilename];
     
     NSLog(@"extract interface zip");
+    NSLog(@"%@", appPath);
+    NSLog(@"%@", [appPath stringByAppendingString:downloadFileName]);
     [sharedLauncher extractZipFileAtDestination:appPath :[appPath stringByAppendingString:downloadFileName]];
     NSLog(@"finished extracting interface zip");
     
diff --git a/launchers/darwin/src/Launcher.h b/launchers/darwin/src/Launcher.h
index 5838e25a82..69484a378d 100644
--- a/launchers/darwin/src/Launcher.h
+++ b/launchers/darwin/src/Launcher.h
@@ -57,6 +57,7 @@ typedef enum LoginErrorTypes
 - (BOOL) loginShouldSetErrorState;
 - (void) displayErrorPage;
 - (void) showLoginScreen;
+- (NSString*) getLauncherPath;
 - (ProcessState) currentProccessState;
 - (void) setCurrentProcessState:(ProcessState) aProcessState;
 - (void) setLoginErrorState:(LoginError) aLoginError;
diff --git a/launchers/darwin/src/Launcher.m b/launchers/darwin/src/Launcher.m
index 07fc8878da..3ab4379e7a 100644
--- a/launchers/darwin/src/Launcher.m
+++ b/launchers/darwin/src/Launcher.m
@@ -73,6 +73,11 @@ static BOOL const DELETE_ZIP_FILES = TRUE;
     return filePath;
 }
 
+- (NSString*) getLauncherPath
+{
+    return [[[NSBundle mainBundle] bundlePath] stringByAppendingString:@"/Contents/MacOS/"];
+}
+
 - (void) extractZipFileAtDestination:(NSString *)destination :(NSString*)file
 {
     NSTask* task = [[NSTask alloc] init];
@@ -174,7 +179,7 @@ static BOOL const DELETE_ZIP_FILES = TRUE;
 
 - (NSString*) getAppPath
 {
-    return [[[NSBundle mainBundle] bundlePath] stringByAppendingString:@"/Contents/MacOS/"];
+    return [self getDownloadPathForContentAndScripts];
 }
 
 - (BOOL) loginShouldSetErrorState
@@ -317,7 +322,7 @@ static BOOL const DELETE_ZIP_FILES = TRUE;
 
 - (void) launchInterface
 {
-    NSString* launcherPath = [[self getAppPath] stringByAppendingString:@"HQ Launcher"];
+    NSString* launcherPath = [[self getLauncherPath] stringByAppendingString:@"HQ Launcher"];
     
     [[Settings sharedSettings] setLauncherPath:launcherPath];
     [[Settings sharedSettings] save];
@@ -351,8 +356,6 @@ static BOOL const DELETE_ZIP_FILES = TRUE;
     }
     [workspace launchApplicationAtURL:url options:NSWorkspaceLaunchNewInstance configuration:[NSDictionary dictionaryWithObject:arguments forKey:NSWorkspaceLaunchConfigurationArguments] error:&error];
     
-    //NSLog(@"arguments %@", [NSDictionary dictionaryWithObject:arguments forKey:NSWorkspaceLaunchConfigurationArguments]);
-    
     [NSApp terminate:self];
 }
 
diff --git a/launchers/darwin/src/main.mm b/launchers/darwin/src/main.mm
index cdcd66f963..41e2986af7 100644
--- a/launchers/darwin/src/main.mm
+++ b/launchers/darwin/src/main.mm
@@ -17,7 +17,7 @@ void redirectLogToDocuments()
 
 int main(int argc, const char* argv[]) {
     //NSApp.appearance = [NSAppearance appearanceNamed: NSAppearanceNameAqua];
-    redirectLogToDocuments();
+    //redirectLogToDocuments();
     NSArray* apps = [NSRunningApplication runningApplicationsWithBundleIdentifier:@"com.highfidelity.launcher"];
     if ([apps count] > 1) {
         NSLog(@"launcher is already running");