tweaked mac run command and parameters

abrahamYG · Apr 25, 2019 · e27ca48 · e27ca48
1 parent 9bcc302
commit e27ca48
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 4 deletions.
diff --git a/src/classes/Campaign.ts b/src/classes/Campaign.ts
@@ -57,15 +57,18 @@ export default class Campaign {
 	}
 	static getCampaignRunCommand = (campaign:ICampaign):string => {
 		console.group("getCampaignRunCommand");
-		const command = Config.getRunCommand();
+		const entryPoint = (campaign.entryPoint)?campaign.entryPoint:campaign.maps[0].destination;
+		const entryPointPath = path.join(Campaign.getCampaignsInstallDir(),entryPoint)
+		const command = Config.getRunCommand().replace("{map}",entryPointPath);
 		console.log("command", command)
 		console.groupEnd();
 		return command;
 	}
 	static getCampaignRunParams = (campaign:ICampaign):Array<string> => {
 		console.group("getCampaignRunParams");
 		const entryPoint = (campaign.entryPoint)?campaign.entryPoint:campaign.maps[0].destination;
-		const params = Config.getRunParams().map(e=>e.replace("{map}",path.join(Campaign.getCampaignsInstallDir(),entryPoint));)
+		const entryPointPath = path.join(Campaign.getCampaignsInstallDir(),entryPoint)
+		const params = Config.getRunParams().map(e=>e.replace("{map}",entryPointPath);)
 
 		console.log("params", params)
 		console.groupEnd();

diff --git a/src/classes/Config.ts b/src/classes/Config.ts
@@ -78,15 +78,15 @@ export default class Config {
 
 		const commands:any = {
 			WINDOWS:path.join(baseDir?baseDir:Config.getInstallDir(),"Support64/" ,"SC2Switcher_x64.exe"),
-			MAC:"open {map}",
+			MAC:"open",
 			LINUX:"wine \"C:\\Program Files (x86)\\StarCraft II\\StarCraft II.exe\""
 		};
 		return Config.configFileExists()? (Config.loadFromDisk().runCommand):commands[currentPlatform];
 	}
 	static getRunParams():Array<string> {
 		const defaultParams:any = {
 			WINDOWS:'-run {map} -reloadcheck',
-			MAC:"-a \"sc2switcher\"",
+			MAC:"-a {map} \"sc2switcher\"",
 			LINUX:"-run {map} -reloadcheck"
 		};
 		const params = Config.configFileExists()&&Config.loadFromDisk().params? (Config.loadFromDisk().params):defaultParams[currentPlatform];