added SKIP_AUTORUN command line flag to disable automatically running viewer after install

1 files changed, 8 insertions, 4 deletions

diff --git a/indra/newview/installers/windows/installer_template.nsi b/indra/newview/installers/windows/installer_template.nsi
index 20623ced84..8c8b4971cf 100755
--- a/indra/newview/installers/windows/installer_template.nsi
+++ b/indra/newview/installers/windows/installer_template.nsi
@@ -105,8 +105,8 @@ Var INSTEXE
 Var INSTSHORTCUT

 Var COMMANDLINE         # Command line passed to this installer, set in .onInit

 Var SHORTCUT_LANG_PARAM # "--set InstallLanguage de", Passes language to viewer

-Var SKIP_DIALOGS        # Set from command line in  .onInit. autoinstall 

-                        # GUI and the defaults.

+Var SKIP_DIALOGS        # Set from command line in  .onInit. autoinstall GUI and the defaults.

+Var SKIP_AUTORUN		# Skip automatic launch of the viewer after install

 Var DO_UNINSTALL_V2     # If non-null, path to a previous Viewer 2 installation that will be uninstalled.

 

 # Function definitions should go before file includes, because calls to

@@ -145,6 +145,10 @@ Call CheckWindowsVersion					# Don't install On unsupported systems
     IfErrors +2 0	# If error jump past setting SKIP_DIALOGS

         StrCpy $SKIP_DIALOGS "true"

 

+	${GetOptions} $COMMANDLINE "/SKIP_AUTORUN" $0

+	IfErrors +2 0 ; If error jump past setting SKIP_AUTORUN

+		StrCpy $SKIP_AUTORUN "true"

+

     ${GetOptions} $COMMANDLINE "/LANGID=" $0	# /LANGID=1033 implies US English

 

 # If no language (error), then proceed

@@ -675,8 +679,8 @@ FunctionEnd
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;

 Function .onInstSuccess

 Call CheckWindowsServPack		# Warn if not on the latest SP before asking to launch.

-    Push $R0					# Option value, unused

-        

+	Push $R0					# Option value, unused

+	StrCmp $SKIP_AUTORUN "true" +2;

 # Assumes SetOutPath $INSTDIR

 	Exec '"$WINDIR\explorer.exe" "$INSTDIR\$INSTEXE"'

 	Pop $R0