pass over the original etl commandline arguments to the updater, refs #…

…32
etlegacy · Dec 12, 2014 · f98b5ba · f98b5ba
1 parent cd65cd5
commit f98b5ba
Show file tree

Hide file tree

Showing 3 changed files with 36 additions and 7 deletions.
diff --git a/src/client/cl_update.c b/src/client/cl_update.c
@@ -36,14 +36,15 @@
 
 #ifdef _WIN32
 #define UPDATE_BINARY "updater.exe"
-#define UPDATE_CMD "\"%s\" --install-dir \"%s\" --package-dir \"%s\" --script \"%s\" --wait \"%s\" --auto-close --execute etl.exe"
+#define UPDATE_CMD "\"%s\" --install-dir \"%s\" --package-dir \"%s\" --script \"%s\" --wait \"%s\" --auto-close --execute \"etl.exe %s\""
 #else
 #define UPDATE_BINARY "updater"
-#define UPDATE_CMD "'%s' --install-dir '%s' --package-dir '%s' --script '%s' --wait '%s' --auto-close --execute etl"
+#define UPDATE_CMD "'%s' --install-dir '%s' --package-dir '%s' --script '%s' --wait '%s' --auto-close --execute 'etl %s'"
 #endif
 #define UPDATE_PACKAGE "updater.zip"
 #define UPDATE_CONFIG "updater.xml"
-#define UPDATE_SERVER_DLFILE "?sys=" CPUSTRING "&ver=" ETLEGACY_VERSION_SHORT "&file="
+#define UPDATE_SERVER_DLFILE UPDATE_SERVER_NAME "?sys=" CPUSTRING "&ver=" ETLEGACY_VERSION_SHORT "&file=%s"
+#define MIN_PACK_LEN 4
 
 autoupdate_t autoupdate;
 
@@ -182,7 +183,7 @@ static void CL_RunUpdateBinary(const char *updateBinary, const char *updateConfi
 		CL_ClearStaticDownload();
 	}
 
-	Sys_StartProcess(va(UPDATE_CMD, fn, Cvar_VariableString("fs_basepath"), FS_BuildOSPath(Cvar_VariableString("fs_homepath"), AUTOUPDATE_DIR, NULL), FS_BuildOSPath(Cvar_VariableString("fs_homepath"), AUTOUPDATE_DIR, updateConfig), Cvar_VariableString("com_pid")), qtrue);
+	Sys_StartProcess(va(UPDATE_CMD, fn, Cvar_VariableString("fs_basepath"), FS_BuildOSPath(Cvar_VariableString("fs_homepath"), AUTOUPDATE_DIR, NULL), FS_BuildOSPath(Cvar_VariableString("fs_homepath"), AUTOUPDATE_DIR, updateConfig), Cvar_VariableString("com_pid"), Com_GetCommandLine()), qtrue);
 
 	// reinitialize the filesystem if the game directory or checksum has changed
 	// - after Legacy mod update
@@ -222,7 +223,7 @@ qboolean CL_CheckUpdateDownloads(void)
 	// Auto-update
 	if (autoupdate.updateStarted)
 	{
-		if (strlen(com_updatefiles->string) > 4)
+		if (strlen(com_updatefiles->string) > MIN_PACK_LEN)
 		{
 			CL_InitDownloads();
 			return qtrue;
@@ -252,7 +253,7 @@ qboolean CL_InitUpdateDownloads(void)
 #ifdef FEATURE_AUTOUPDATE
 	if (autoupdate.updateStarted && NET_CompareAdr(autoupdate.autoupdateServer, clc.serverAddress))
 	{
-		if (strlen(com_updatefiles->string) > 4)
+		if (strlen(com_updatefiles->string) > MIN_PACK_LEN)
 		{
 			char *updateFile;
 			char updateFilesRemaining[MAX_TOKEN_CHARS] = "";
@@ -296,7 +297,7 @@ qboolean CL_InitUpdateDownloads(void)
 					Q_strcat(updateFilesRemaining, sizeof(updateFilesRemaining), va("%s;", updateFile));
 				}
 
-				if (strlen(updateFilesRemaining) > 4)
+				if (strlen(updateFilesRemaining) > MIN_PACK_LEN)
 				{
 					Cvar_Set("com_updatefiles", updateFilesRemaining);
 				}

diff --git a/src/qcommon/common.c b/src/qcommon/common.c
@@ -479,6 +479,33 @@ void Com_ParseCommandLine(char *commandLine)
 	}
 }
 
+char *Com_GetCommandLine(void)
+{
+	static char commandLine[1024];
+	char *offset;
+	int i = 0, len = 0, charoffset = 0;
+	commandLine[0] = '\0';
+	offset = commandLine;
+	for (; i < com_numConsoleLines; i++)
+	{
+		if (!com_consoleLines[i])
+		{
+			continue;
+		}
+
+		len = strlen(com_consoleLines[i]);
+		if (len)
+		{
+			Q_strncpyz(offset, va("+%s", com_consoleLines[i]), 1024 - charoffset);
+			len = len + 1;
+			charoffset += len;
+			offset += len;
+		}
+	}
+
+	return commandLine;
+}
+
 /**
  * @brief Check for "safe" on the command line, which will skip loading of wolfconfig.cfg
  */

diff --git a/src/qcommon/qcommon.h b/src/qcommon/qcommon.h
@@ -1004,6 +1004,7 @@ void Com_TouchMemory(void);
 
 // commandLine should not include the executable name (argv[0])
 void Com_Init(char *commandLine);
+char *Com_GetCommandLine(void);
 void Com_Frame(void);
 void Com_Shutdown(qboolean badProfile);