From fa3b373e99a9f82c271e0078ae31ebd123c2b671 Mon Sep 17 00:00:00 2001
From: LoRd_MuldeR <mulder2@gmx.de>
Date: Tue, 26 Nov 2013 22:58:14 +0100
Subject: [PATCH] Use more LogicLib in the installer wrapper code.

---
 etc/NSIS/wrapper.nsi | 62 +++++++++++++++++++++++++-------------------
 1 file changed, 35 insertions(+), 27 deletions(-)

diff --git a/etc/NSIS/wrapper.nsi b/etc/NSIS/wrapper.nsi
index 70c6f0c7..d450a55f 100644
--- a/etc/NSIS/wrapper.nsi
+++ b/etc/NSIS/wrapper.nsi
@@ -51,6 +51,8 @@
 ;Web-Site
 !define MyWebSite "http://mulder.at.gg/"
 
+;Installer file name
+!define InstallerFileName "$PLUGINSDIR\LameXP-SETUP-r${LAMEXP_BUILD}.exe"
 
 ;--------------------------------
 ;Includes
@@ -135,6 +137,9 @@ Section "-LaunchTheInstaller"
 	InitPluginsDir
 	SetOutPath "$PLUGINSDIR"
 	
+	SetOverwrite on
+	File "/oname=${InstallerFileName}" "${LAMEXP_SOURCE_FILE}"
+
 	; --------
 	
 	${If} "$EXEFILE" == "LameXP.exe"
@@ -154,39 +159,42 @@ Section "-LaunchTheInstaller"
 
 	; --------
 
-	RunTryAgain:
+	${Do}
+		SetOverwrite ifdiff
+		File "/oname=${InstallerFileName}" "${LAMEXP_SOURCE_FILE}"
+		
+		DetailPrint "ExecShellWait: ${InstallerFileName}"
+		${StdUtils.ExecShellWait} $R1 "${InstallerFileName}" "open" '$R9'
+		DetailPrint "Result: $R1"
+		
+		${IfThen} $R1 == "no_wait" ${|} Goto RunSuccess ${|}
+		
+		${If} $R1 != "error"
+			Sleep 333
+			HideWindow
+			${StdUtils.WaitForProc} $R1
+			Goto RunSuccess
+		${EndIf}
+		
+		MessageBox MB_RETRYCANCEL|MB_ICONSTOP|MB_TOPMOST "Failed to launch the installer. Please try again!" IDCANCEL FallbackMode
+	${Loop}
+	
+
+	; -----------
+
+	FallbackMode:
+
+	DetailPrint "Installer not launched yet, trying fallback mode!"
 
 	SetOverwrite ifdiff
-	File "/oname=$PLUGINSDIR\LameXP-SETUP-r${LAMEXP_BUILD}.exe" "${LAMEXP_SOURCE_FILE}"
-
-	DetailPrint "ExecShellWait: $PLUGINSDIR\LameXP-SETUP-r${LAMEXP_BUILD}.exe"
-	${StdUtils.ExecShellWait} $R1 "$PLUGINSDIR\LameXP-SETUP-r${LAMEXP_BUILD}.exe" "open" '$R9'
-	DetailPrint "Result: $R1"
-	
-	StrCmp $R1 "error" RunFailed
-	StrCmp $R1 "no_wait" RunSuccess
-	Sleep 333
-	HideWindow
-	${StdUtils.WaitForProc} $R1
-	Goto RunSuccess
-	
-	; --------
-
-	RunFailed:
-
-	MessageBox MB_RETRYCANCEL|MB_ICONSTOP|MB_TOPMOST "Failed to launch the installer. Please try again!" IDRETRY RunTryAgain
-
-	; --------
-
-	SetOverwrite ifdiff
-	File "/oname=$PLUGINSDIR\LameXP-SETUP-r${LAMEXP_BUILD}.exe" "${LAMEXP_SOURCE_FILE}"
+	File "/oname=${InstallerFileName}" "${LAMEXP_SOURCE_FILE}"
 
 	ClearErrors
-	ExecShell "open" "$PLUGINSDIR\LameXP-SETUP-r${LAMEXP_BUILD}.exe" '$R9' SW_SHOWNORMAL
+	ExecShell "open" "${InstallerFileName}" '$R9' SW_SHOWNORMAL
 	IfErrors 0 RunSuccess
 
 	ClearErrors
-	ExecShell "" "$PLUGINSDIR\LameXP-SETUP-r${LAMEXP_BUILD}.exe" '$R9' SW_SHOWNORMAL
+	ExecShell "" "${InstallerFileName}" '$R9' SW_SHOWNORMAL
 	IfErrors 0 RunSuccess
 
 	; --------
@@ -202,6 +210,6 @@ Section "-LaunchTheInstaller"
 	
 	RunSuccess:
 
-	Delete /REBOOTOK "$PLUGINSDIR\LameXP-SETUP-r${LAMEXP_BUILD}.exe"
+	Delete /REBOOTOK "${InstallerFileName}"
 	SetErrorLevel 0
 SectionEnd