diff --git a/build/macosx/appbundler/build.xml b/build/macosx/appbundler/build.xml index e0a5e5b3b..f2af99aea 100644 --- a/build/macosx/appbundler/build.xml +++ b/build/macosx/appbundler/build.xml @@ -85,7 +85,7 @@ questions. - + diff --git a/build/macosx/appbundler/native/main.m b/build/macosx/appbundler/native/main.m index 516efb08f..5386ac60c 100644 --- a/build/macosx/appbundler/native/main.m +++ b/build/macosx/appbundler/native/main.m @@ -98,13 +98,13 @@ int launch(char *commandName) { // execute privileged NSString *privileged = [infoDictionary objectForKey:@JVM_RUN_PRIVILEGED]; - if ( privileged != nil && getuid() != 0 ) { + if (privileged != nil && getuid() != 0) { NSDictionary *error = [NSDictionary new]; NSString *script = [NSString stringWithFormat:@"do shell script \"\\\"%@\\\" > /dev/null 2>&1 &\" with administrator privileges", [NSString stringWithCString:commandName encoding:NSASCIIStringEncoding]]; NSAppleScript *appleScript = [[NSAppleScript new] initWithSource:script]; if ([appleScript executeAndReturnError:&error]) { // This means we successfully elevated the application and can stop in here. - return; + return 0; // Should this return 'error' instead? [fry] } }