From 0c954367a0760f32fd26ae8b0fd71aabd46da661 Mon Sep 17 00:00:00 2001 From: Paul Chote Date: Sat, 5 Feb 2011 12:44:33 +1300 Subject: [PATCH] Fix installing ra from disk --- OpenRA.Launcher.Mac/Controller.m | 2 +- .../Release/OpenRA.app/Contents/MacOS/OpenRA | Bin 81736 -> 81736 bytes OpenRA.Utility/Command.cs | 2 +- 3 files changed, 2 insertions(+), 2 deletions(-) diff --git a/OpenRA.Launcher.Mac/Controller.m b/OpenRA.Launcher.Mac/Controller.m index 791db648eb..b368c5cb6d 100644 --- a/OpenRA.Launcher.Mac/Controller.m +++ b/OpenRA.Launcher.Mac/Controller.m @@ -65,7 +65,7 @@ extern char **environ; - (void)installRAPackages:(NSArray *)args { // Todo: check if we can write to the requested dir, escalate priviledges if required. - NSArray *a = [NSArray arrayWithObjects:@"--install-ra-packages-inner", [args objectAtIndex:2], nil]; + NSArray *a = [NSArray arrayWithObjects:@"--install-ra-packages-inner", [args objectAtIndex:2], [args objectAtIndex:3], nil]; [self runUtilityWithArgs:a]; } diff --git a/OpenRA.Launcher.Mac/build/Release/OpenRA.app/Contents/MacOS/OpenRA b/OpenRA.Launcher.Mac/build/Release/OpenRA.app/Contents/MacOS/OpenRA index 6dd080c849a6df7438993773745c62cb039b544f..769bc2a49b81cc61d1af736e343f535707340c01 100755 GIT binary patch delta 8924 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 delta 9115 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