From f108735f7415e88af2ac6267978522546a4fa0bc Mon Sep 17 00:00:00 2001 From: Paul Chote Date: Thu, 25 Nov 2010 16:15:26 +1300 Subject: [PATCH] Keep the bs inside the launcher --- OpenRA.Utility/Command.cs | 7 +++---- OpenRA.Utility/Program.cs | 2 +- 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/OpenRA.Utility/Command.cs b/OpenRA.Utility/Command.cs index 8dbf616204..496da06257 100644 --- a/OpenRA.Utility/Command.cs +++ b/OpenRA.Utility/Command.cs @@ -57,17 +57,16 @@ namespace OpenRA.Utility { string[] args = argValue.Split(','); - if (args.Length != 3) + if (args.Length != 2) { Console.WriteLine("Error: invalid syntax"); return; } string zipFile = args[0]; - string mod = args[1]; - string path = args[2]; + string path = args[1]; if (!File.Exists(zipFile)) { Console.WriteLine("Error: Could not find {0}", zipFile); return; } - string dest = "mods{0}{1}{0}{2}".F(Path.DirectorySeparatorChar,mod,path); + string dest = "mods{0}{1}".F(Path.DirectorySeparatorChar,path); List extracted = new List(); try { diff --git a/OpenRA.Utility/Program.cs b/OpenRA.Utility/Program.cs index 90519a1abc..4a3d98e3da 100644 --- a/OpenRA.Utility/Program.cs +++ b/OpenRA.Utility/Program.cs @@ -82,7 +82,7 @@ namespace OpenRA.Utility Console.WriteLine(" -l,--list-mods List currently installed mods"); Console.WriteLine(" -i=MODS,--mod-info=MODS List metadata for MODS (comma separated list of mods)"); Console.WriteLine(" --download-url=URL,DEST Download a file from URL to DEST"); - Console.WriteLine(" --extract-zip=ZIPFILE,MOD,PATH Extract the zip ZIPFILE to DEST relative to MOD"); + Console.WriteLine(" --extract-zip=ZIPFILE,PATH Extract the zip ZIPFILE to DEST (relative to openra dir)"); Console.WriteLine(" --install-ra-packages=PATH Install required packages for RA from CD to PATH"); Console.WriteLine(" --install-cnc-packages=PATH Install required packages for C&C from CD to PATH"); Console.WriteLine(" --settings-value=SUPPORTDIR,KEY Get value of KEY in SUPPORTDIR/settings.yaml");