Skip to content
Snippets Groups Projects
Commit 8ba4f526 authored by Nat Goodspeed's avatar Nat Goodspeed
Browse files

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.
parent b0eb67f6
No related branches found
No related tags found
No related merge requests found
...@@ -709,13 +709,24 @@ FunctionEnd ...@@ -709,13 +709,24 @@ FunctionEnd
;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
Function .onInstSuccess Function .onInstSuccess
Call CheckWindowsServPack # Warn if not on the latest SP before asking to launch. 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 ;; $EXEDIR is where we find the installer file
;; Put a marker file there so VMP will know we're done ;; Put a marker file there so VMP will know we're done
;; and it can delete the download directory next time. ;; and it can delete the download directory next time.
;; http://nsis.sourceforge.net/Write_text_to_a_file ;; http://nsis.sourceforge.net/Write_text_to_a_file
FileOpen $9 "$EXEDIR\nsis.winstall" w FileOpen $0 "$EXEDIR\nsis.winstall" w
FileWrite $9 "NSIS done$\n" FileWrite $0 "NSIS done$\n"
FileClose $9 FileClose $0
ClearErrors
Pop $0
Pop $R0
Push $R0 # Option value, unused# Push $R0 # Option value, unused#
StrCmp $SKIP_AUTORUN "true" +2; StrCmp $SKIP_AUTORUN "true" +2;
# Assumes SetOutPath $INSTDIR # Assumes SetOutPath $INSTDIR
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment