Windows updater can update itself (Fixes issue 593)

git-svn-id: http://svn.dmdirc.com/trunk@3141 00569f92-eb28-0410-84fd-f71c24880f

launcher/windows/DMDirc.dpr

@@ -5,7 +5,7 @@ program DMDirc;
 {$R icon.rc}
 {$R version.rc}
 
-uses Windows, SysUtils, classes;
+uses Windows, SysUtils, classes, StrUtils;
 
 // Run an application and wait for it to finish.
 function ExecAndWait(sProgramToRun: String): Longword;
@@ -41,10 +41,18 @@ begin
 		dwFlags := STARTF_USESHOWWINDOW;
 		wShowWindow := SW_SHOWNORMAL;
 	end;
-
+	
 	CreateProcess(nil, PChar(sProgramToRun), nil, nil, False, NORMAL_PRIORITY_CLASS, nil, nil, StartupInfo, ProcessInfo);
 end;
 
+procedure RunProgram(sProgramToRun: String; wait: boolean);
+begin
+	if wait then ExecAndWait(sProgramToRun)
+	else Launch(sProgramToRun);
+end;
+
+const
+	launcherVersion: String = '1';
 var
 	errorMessage: String;
 	javaCommand: String = 'javaw.exe';
@@ -53,13 +61,15 @@ var
 	i: integer;
 	hK32: THandle;
 	jarName: String;
+	launcherUpdate: boolean = false;
 begin
 	jarName := ExtractFileDir(paramstr(0))+'\DMDirc.jar';
 	
 	directory := GetEnvironmentVariable('APPDATA')+'\DMDirc';
 	if ParamCount > 0 then begin
 		for i := 1 to ParamCount do begin
-			cliParams := cliParams+' '+paramstr(i);
+			if AnsiContainsStr(cliParams, ' ') then cliParams := cliParams+' "'+paramstr(i)+'"'
+			else cliParams := cliParams+' '+paramstr(i);
 			if (paramstr(i) = '-d') or (paramstr(i) = '--directory') then begin
 				if ParamCount > i then begin
 					directory := paramstr(i+1);
@@ -69,7 +79,8 @@ begin
 	end;
 
 	// Update if needed.
-	if FileExists(directory+'\.DMDirc.jar') then begin
+	launcherUpdate := FileExists(directory+'\.DMDirc.exe') and FileExists(directory+'\.DMDircUpdater.exe');
+	if FileExists(directory+'\.DMDirc.jar') or launcherUpdate then begin
 		// Vista Sucks.
 		hK32 := GetModuleHandle('kernel32');
 		if GetProcAddress(hK32, 'GetLocaleInfoEx') <> nil then begin
@@ -86,32 +97,18 @@ begin
 				errorMessage := errorMessage+#13#10+'Please click ''Allow'' on the UAC prompt to complete the update, or click no';
 				errorMessage := errorMessage+#13#10+'here to continue without updating.';
 				if MessageBox(0, PChar(errorMessage), 'Windows Vista', MB_YESNO) = IDYES then begin
-					ExecAndWait('DMDircUpdater.exe '+directory+'\.DMDirc.jar');
+					RunProgram('"'+ExtractFileDir(paramstr(0))+'\DMDircUpdater.exe" --UpdateSourceDir "'+directory+'"', not launcherUpdate);
 				end;
 			end
-			else ExecAndWait('DMDircUpdater.exe '+directory+'\.DMDirc.jar');
+			else RunProgram('"'+ExtractFileDir(paramstr(0))+'\DMDircUpdater.exe" --UpdateSourceDir "'+directory+'"', not launcherUpdate);
 		end
-		else ExecAndWait('DMDircUpdater.exe '+directory+'\.DMDirc.jar');
+		else RunProgram('"'+ExtractFileDir(paramstr(0))+'\DMDircUpdater.exe" --UpdateSourceDir "'+directory+'"', not launcherUpdate);
 	end;
 	
-	// Check JVM
-	if (ExecAndWait(javaCommand+' -version') <> 0) then begin
-		errorMessage := 'No JVM is currently installed.';
-		errorMessage := errorMessage+#13#10;
-		errorMessage := errorMessage+#13#10+'DMDirc requires a 1.6.0 compatible JVM, you can get one from:';
-		errorMessage := errorMessage+#13#10+'http://jdl.sun.com/webapps/getjava/BrowserRedirect';
-		errorMessage := errorMessage+#13#10;
-		errorMessage := errorMessage+#13#10+'If you feel this is incorrect, or you require some further assistance,';
-		errorMessage := errorMessage+#13#10+'please feel free to contact us.';
-		
-		MessageBox(0, PChar(errorMessage), 'Sorry, DMDirc is unable to continue', MB_OK + MB_ICONSTOP);
-	end
-	// Else try and run client. (This only asks for help output to check that client
-	// runs on this OS, otherwise later segfaults or so would cause the error to
-	// appear
-	else if FileExists(jarName) then begin
-		if (ExecAndWait(javaCommand+' -jar "'+jarName+'" --help') <> 0) then begin
-			errorMessage := 'The currently installed version of java is not compatible with DMDirc.';
+	if not launcherUpdate then begin
+		// Check JVM
+		if (ExecAndWait(javaCommand+' -version') <> 0) then begin
+			errorMessage := 'No JVM is currently installed.';
 			errorMessage := errorMessage+#13#10;
 			errorMessage := errorMessage+#13#10+'DMDirc requires a 1.6.0 compatible JVM, you can get one from:';
 			errorMessage := errorMessage+#13#10+'http://jdl.sun.com/webapps/getjava/BrowserRedirect';
@@ -121,12 +118,28 @@ begin
 			
 			MessageBox(0, PChar(errorMessage), 'Sorry, DMDirc is unable to continue', MB_OK + MB_ICONSTOP);
 		end
+		// Else try and run client. (This only asks for help output to check that client
+		// runs on this OS, otherwise later segfaults or so would cause the error to
+		// appear
+		else if FileExists(jarName) then begin
+			if (ExecAndWait(javaCommand+' -jar "'+jarName+'" --help') <> 0) then begin
+				errorMessage := 'The currently installed version of java is not compatible with DMDirc.';
+				errorMessage := errorMessage+#13#10;
+				errorMessage := errorMessage+#13#10+'DMDirc requires a 1.6.0 compatible JVM, you can get one from:';
+				errorMessage := errorMessage+#13#10+'http://jdl.sun.com/webapps/getjava/BrowserRedirect';
+				errorMessage := errorMessage+#13#10;
+				errorMessage := errorMessage+#13#10+'If you feel this is incorrect, or you require some further assistance,';
+				errorMessage := errorMessage+#13#10+'please feel free to contact us.';
+				
+				MessageBox(0, PChar(errorMessage), 'Sorry, DMDirc is unable to continue', MB_OK + MB_ICONSTOP);
+			end
+			else begin
+				Launch(javaCommand+' -ea -jar "'+jarName+'"'+' -l windows-'+launcherVersion+' '+cliParams)
+			end;
+		end
 		else begin
-			Launch(javaCommand+' -ea -jar "'+jarName+'"'+cliParams)
+			errorMessage := 'Your DMDirc installation has been broken. DMDirc.jar no longer exists.';
+			MessageBox(0, PChar(errorMessage), 'Sorry, DMDirc is unable to continue', MB_OK + MB_ICONSTOP);
 		end;
-	end
-	else begin
-		errorMessage := 'Your DMDirc installation has been broken. DMDirc.jar no longer exists.';
-		MessageBox(0, PChar(errorMessage), 'Sorry, DMDirc is unable to continue', MB_OK + MB_ICONSTOP);
 	end;
 end.

launcher/windows/DMDircUpdater.dpr

@@ -4,30 +4,112 @@ program DMDircUpdater;
 
 {$R UAC.rc}
 
-uses Windows, SysUtils, classes;
+uses Windows, SysUtils, classes, StrUtils;
 
+// Run an application and don't wait for it to finish.
+procedure Launch(sProgramToRun: String);
 var
-	updateFile: String = '';
+	StartupInfo: TStartupInfo;
+	ProcessInfo: TProcessInformation;
+begin
+	FillChar(StartupInfo, SizeOf(TStartupInfo), 0);
+	with StartupInfo do begin
+		cb := SizeOf(TStartupInfo);
+		dwFlags := STARTF_USESHOWWINDOW;
+		wShowWindow := SW_SHOWNORMAL;
+	end;
+	MessageBox(0, pchar('Foo: '+sProgramToRun), 'Update Failed', MB_ICONSTOP);
+	CreateProcess(nil, PChar(sProgramToRun), nil, nil, False, NORMAL_PRIORITY_CLASS, nil, nil, StartupInfo, ProcessInfo);
+end;
+
+var
+	sourceDir: String = '';
+	thisDir: String;
+	cliParams: String = '';
 	i: integer;
 	jarName: String;
+	launcherUpdate: boolean = false;
+	myName: String;
+	canDoMore: boolean = true;
 begin
-	jarName := ExtractFileDir(paramstr(0))+'\DMDirc.jar';
+	myName := ExtractFileName(paramstr(0));
+	thisDir := ExtractFileDir(paramstr(0));
+	jarName := thisDir+'\DMDirc.jar';
 	
 	if ParamCount > 0 then begin
 		for i := 1 to ParamCount do begin
-			updateFile := updateFile+' '+paramstr(i);
+			if AnsiContainsStr(cliParams, ' ') then cliParams := cliParams+' "'+paramstr(i)+'"'
+			else cliParams := cliParams+' '+paramstr(i);
+			if (paramstr(i) = '--UpdateSourceDir') then begin // Source Directory
+				if ParamCount > i then begin
+					sourceDir := paramstr(i+1);
+				end;
+			end
 		end;
 
-		if FileExists(pchar(jarName)) then begin
-			if not DeleteFile(pchar(jarName)) then begin
-				MessageBox(0, 'Unable to delete DMDirc.jar', 'Update Failed', MB_ICONSTOP);
+		// Look for a launcher update.
+		if FileExists(pchar(sourceDir+'\.DMDirc.exe')) and FileExists(pchar(sourceDir+'\.DMDircUpdater.exe')) then begin
+			if myName = 'DMDircUpdater.exe' then begin
+				// Windows won't let us overwrite ourself, so we need to copy ourself
+				// to another name, and run the new us.
+				if CopyFile(pchar(thisDir+'\DMDircUpdater.exe'), pchar(thisDir+'\DMDircLauncherUpdater.exe'), False) then begin
+					canDoMore := false;
+					Launch('"'+thisDir+'\DMDircLauncherUpdater.exe" '+cliParams);
+				end
+				else begin
+					MessageBox(0, 'Unable to overwrite launcher', 'Launcher Update Failed', MB_ICONSTOP);
+				end;
+			end
+			else begin
+				launcherUpdate := true;
+				if FileExists(pchar(thisDir+'\DMDirc.exe')) then begin
+					if not DeleteFile(pchar(thisDir+'\DMDirc.exe')) then begin
+						MessageBox(0, 'Unable to delete DMDirc.exe', 'Update Failed', MB_ICONSTOP);
+					end;
+				end;
+				
+				if not FileExists(pchar(thisDir+'\DMDirc.exe')) and MoveFile(pchar(sourceDir+'\.DMDirc.exe'), pchar(thisDir+'\DMDirc.exe')) then begin
+					if FileExists(pchar(thisDir+'\DMDircUpdater.exe')) then begin
+						if not DeleteFile(pchar(thisDir+'\DMDircUpdater.exe')) then begin
+							MessageBox(0, 'Unable to delete DMDircUpdater.exe', 'Update Failed', MB_ICONSTOP);
+						end;
+					end;
+					if not FileExists(pchar(thisDir+'\DMDircUpdater.exe')) and MoveFile(pchar(sourceDir+'\.DMDircUpdater.exe'), pchar(thisDir+'\DMDircUpdater.exe')) then begin
+						MessageBox(0, 'Launcher update was successful.', 'Launcher Update Completed', MB_OK);
+					end
+					else begin
+						MessageBox(0, pchar('Unable to update DMDircUpdater.exe'), 'Launcher Update Failed', MB_ICONSTOP);
+					end;
+				end
+				else begin
+					MessageBox(0, pchar('Unable to update DMDirc.exe'), 'Launcher Update Failed', MB_ICONSTOP);
+				end;
 			end;
 		end;
-		if MoveFile(pchar(trim(updateFile)), pchar(jarName)) then begin
-			MessageBox(0, 'Client update was successful.', 'Update Completed', MB_OK);
-		end
-		else begin
-			MessageBox(0, pchar('Unable to move '''+updateFile+''' to DMDirc.jar'), 'Update Failed', MB_ICONSTOP);
+		
+		// Look for client update
+		if canDoMore then begin
+			if FileExists(pchar(sourceDir+'\.DMDirc.jar')) then begin
+				if FileExists(pchar(jarName)) then begin
+					if not DeleteFile(pchar(jarName)) then begin
+						MessageBox(0, 'Unable to delete DMDirc.jar', 'Update Failed', MB_ICONSTOP);
+					end;
+				end;
+				
+				if MoveFile(pchar(sourceDir+'\.DMDirc.jar'), pchar(jarName)) then begin
+					MessageBox(0, 'Client update was successful.', 'Update Completed', MB_OK);
+				end
+				else begin
+					MessageBox(0, pchar('Unable to move '''+sourceDir+'\.DMDirc.jar'' to '+jarName), 'Update Failed', MB_ICONSTOP);
+				end;
+			end;
+			
+			if launcherUpdate then begin
+				MessageBox(0, 'The DMDirc launcher has been updated, to complete the update please relaunch DMDirc.', 'Restart Required', MB_OK);
+			end;
 		end;
+	end
+	else begin
+		MessageBox(0, 'This program can not be run on its own.', 'Error', MB_ICONSTOP);
 	end;
 end.

src/com/dmdirc/updater/components/LauncherComponent.java

@@ -24,6 +24,7 @@ package com.dmdirc.updater.components;
 
 import com.dmdirc.updater.UpdateChecker;
 import com.dmdirc.updater.UpdateComponent;
+import com.dmdirc.util.resourcemanager.ZipResourceManager;
 
 import java.io.File;
 
@@ -92,8 +93,8 @@ public class LauncherComponent implements UpdateComponent {
     /** {@inheritDoc} */
     @Override
     public boolean doInstall(final String path) throws Throwable {
+        final File tmpFile = new File(path);
         if (platform.equalsIgnoreCase("Linux")) {
-            final File tmpFile = new File(path);
             final File targetFile = new File(tmpFile.getParent() + File.separator + ".launcher.sh");
 
             if (targetFile.exists()) {
@@ -103,7 +104,10 @@ public class LauncherComponent implements UpdateComponent {
             tmpFile.renameTo(targetFile);
             return true;
         } else {
-            throw new UnsupportedOperationException("Not supported yet.");
+            final ZipResourceManager ziprm = ZipResourceManager.getInstance(path);
+            ziprm.extractResources("", tmpFile.getParent()+ File.separator);
+            new File(path).delete();
+            return false;
         }
     }