Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-04-20 03:24:00 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge pull request #15915 from danteruiz/new-scripts-arg

Browse source 
DEV-172: Lilypad Launcher (Mac): Instrument the launcher to use the new "override default scripts" command line switch
This commit is contained in:
Shannon Romano 2019-07-11 09:55:44 -07:00 committed by GitHub
commit a4aa5d7eb4
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
launchers/darwin/src/Launcher.m
View file

@ -442,7 +442,7 @@ static BOOL const DELETE_ZIP_FILES = TRUE;
NSString* contentPath = [[self getDownloadPathForContentAndScripts] stringByAppendingString:@"content"];
NSString* displayName = [ self displayName];
NSString* scriptsPath = [[self getAppPath] stringByAppendingString:@"interface.app/Contents/Resources/scripts/simplifiedUI/"];
NSString* scriptsPath = [[self getAppPath] stringByAppendingString:@"interface.app/Contents/Resources/scripts/simplifiedUIBootstrapper.js"];
NSString* domainUrl = [[Settings sharedSettings] getDomainUrl];
NSString* userToken = [[Launcher sharedLauncher] getTokenString];
NSString* homeBookmark = [[NSString stringWithFormat:@"hqhome="] stringByAppendingString:domainUrl];
@ -453,7 +453,7 @@ static BOOL const DELETE_ZIP_FILES = TRUE;
@"--tokens", userToken,
@"--cache", contentPath,
@"--displayName", displayName,
@"--scripts", scriptsPath,
@"--defaultScriptsOverride", scriptsPath,
@"--setBookmark", homeBookmark,
@"--no-updater",
@"--no-launcher", nil];
@ -461,7 +461,7 @@ static BOOL const DELETE_ZIP_FILES = TRUE;
arguments = [NSArray arrayWithObjects:
@"--url" , domainUrl,
@"--cache", contentPath,
@"--scripts", scriptsPath,
@"--defaultScriptsOverride", scriptsPath,
@"--setBookmark", homeBookmark,
@"--no-updater",
@"--no-launcher", nil];