AutoUpdate Mac Installer Script Administrator privileges changes (#656)

niteskum · nethip · commit 57756995c329 · 2018-07-24T11:17:06.000+05:30
* Changes to run Update Script in elevated Mode

* Removed Unintentional Changes

* Correct File Permission check changes

* Corrected remove Command

* Addressed Review Comments
diff --git a/appshell/update_mac.mm b/appshell/update_mac.mm
@@ -67,6 +67,7 @@ + (void) setParams:(NSMutableDictionary *)params {
     _params = params;
 }
 
+
 // Runs a script, given the script path, and args array.
 int RunScript(NSString* launchPath, NSArray* argsArray, BOOL waitUntilExit)
 {
@@ -172,9 +173,39 @@ + (void) RunAppUpdate{
                     else {
                         int pid = [self getCurrentProcessID];
                         NSString* pidString = [NSString stringWithFormat:@"%d", pid];
-                        pArgs = [NSArray arrayWithObjects:shPath, scriptPath, @"-a", bracketsAppName, @"-b", installDir,  @"-l", logFilePath, @"-m", mountPoint,  @"-t", updateDir, @"-p", pidString, @"&", nil];
-                
-                        retval = RunScript(nohupPath, pArgs, false);
+                        BOOL isAdmin = NO;
+
+                        NSString *installDirPath = installDir;
+                        installDirPath = [installDirPath stringByAppendingString:@"/"];
+                        NSString *bracketsAppPath = installDirPath;
+                        bracketsAppPath = [bracketsAppPath stringByAppendingString:bracketsAppName];
+                        
+                        NSFileManager *fm = [NSFileManager defaultManager];
+                        if([fm isWritableFileAtPath:installDirPath] && [fm isWritableFileAtPath:bracketsAppPath] )
+                        {
+                            isAdmin = YES;
+                        }
+                        
+                        
+                        /*Build the Apple Script String*/
+                        NSAppleEventDescriptor *returnDescriptor = NULL;
+                        NSString * appleScriptString;
+                        
+                        appleScriptString = [NSString stringWithFormat:@"do shell script \"%@ %@ %@ -a %@ -b '%@' -l '%@' -m %@  -t '%@' -p %@ > /dev/null 2>&1 &\"", nohupPath, shPath, scriptPath, bracketsAppName, installDir, logFilePath, mountPoint, updateDir, pidString];
+                        
+                        if(!isAdmin) {
+                            appleScriptString = [appleScriptString stringByAppendingString:@" with administrator privileges"];
+                        }
+
+                        NSAppleScript *theScript = [[NSAppleScript alloc] initWithSource:appleScriptString];
+                        
+                        NSDictionary *theError = nil;
+                        
+                        returnDescriptor = [theScript executeAndReturnError: &theError];
+                        if(returnDescriptor == NULL) {
+                            NSString *logStr = @"ERROR: scriptexecution Failed error: BA_06";
+                            [logStr writeToFile:installStatusFilePath atomically:YES encoding:NSUTF8StringEncoding error:nil];
+                        }
                     }
                 }
             }
diff --git a/installer/mac/update.sh b/installer/mac/update.sh
@@ -172,6 +172,7 @@ function updateBrackets(){
             printInfo "Unmounted the DMG and attempying to open Brackets ..."
         fi
         
+        rm -rf "$TEMP_DIR/$APP_NAME"
         open -a "$APP_DIR/$APP_NAME"
         exitStatus=$?
         if [ $exitStatus -ne 0 ]
