From 8ba4f526c042bdf37acb7e23288fc7510bd94c4a Mon Sep 17 00:00:00 2001 From: Nat Goodspeed Date: Wed, 18 Oct 2017 16:16:34 -0400 Subject: MAINT-7812: NSIS check for /marker before writing marker file. The /marker switch is passed by the (new) VMP. If any user wants to explicitly pass the /marker switch to the installer, s/he shouldn't mind ending up with an nsis.winstall file in the download directory. --- indra/newview/installers/windows/installer_template.nsi | 17 ++++++++++++++--- 1 file changed, 14 insertions(+), 3 deletions(-) (limited to 'indra') diff --git a/indra/newview/installers/windows/installer_template.nsi b/indra/newview/installers/windows/installer_template.nsi index cd867d79b3..4e41d6d083 100644 --- a/indra/newview/installers/windows/installer_template.nsi +++ b/indra/newview/installers/windows/installer_template.nsi @@ -709,13 +709,24 @@ FunctionEnd ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; Function .onInstSuccess Call CheckWindowsServPack # Warn if not on the latest SP before asking to launch. + Push $R0 + Push $0 + ;; MAINT-7812: Only write nsis.winstall file with /marker switch + ${GetParameters} $R0 + ${GetOptionsS} $R0 "/marker" $0 + ;; If no /marker switch, skip to ClearErrors + IfErrors +4 0 ;; $EXEDIR is where we find the installer file ;; Put a marker file there so VMP will know we're done ;; and it can delete the download directory next time. ;; http://nsis.sourceforge.net/Write_text_to_a_file - FileOpen $9 "$EXEDIR\nsis.winstall" w - FileWrite $9 "NSIS done$\n" - FileClose $9 + FileOpen $0 "$EXEDIR\nsis.winstall" w + FileWrite $0 "NSIS done$\n" + FileClose $0 + + ClearErrors + Pop $0 + Pop $R0 Push $R0 # Option value, unused# StrCmp $SKIP_AUTORUN "true" +2; # Assumes SetOutPath $INSTDIR -- cgit v1.2.3