Muldersoft/LameXP
Muldersoft/LameXP
1
0
Fork 0
Code Releases 2 Activity

Use more LogicLib in the installer wrapper code.

Browse Source
This commit is contained in:
LoRd_MuldeR 2013-11-26 22:58:14 +01:00
parent ee05308c0e
commit fa3b373e99
1 changed files with 35 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

62
etc/NSIS/wrapper.nsi
View File

@ -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