From 1d2ded8c5f1893a246fb1b7d7b5f12f451750827 Mon Sep 17 00:00:00 2001
From: Nat Goodspeed <nat@lindenlab.com>
Date: Thu, 17 Aug 2017 18:48:41 -0400
Subject: MAINT-7661: Make NSIS installer place .winstall marker file.
This reduces a timing hole in which one instance of SL_Launcher might place
a .winstall marker file in the download directory and run the downloaded
installer, but another SL_Launcher instance might discover that marker and try
to delete the directory before the NSIS install completes.
---
indra/newview/installers/windows/installer_template.nsi | 7 +++++++
1 file changed, 7 insertions(+)
diff --git a/indra/newview/installers/windows/installer_template.nsi b/indra/newview/installers/windows/installer_template.nsi
index 4ca850e30f..ade808e3e2 100644
--- a/indra/newview/installers/windows/installer_template.nsi
+++ b/indra/newview/installers/windows/installer_template.nsi
@@ -714,6 +714,13 @@ FunctionEnd
;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
Function .onInstSuccess
Call CheckWindowsServPack # Warn if not on the latest SP before asking to launch.
+ ;; $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
Push $R0 # Option value, unused#
StrCmp $SKIP_AUTORUN "true" +2;
# Assumes SetOutPath $INSTDIR
--
cgit v1.2.3