livie
/
phoenix-firestorm
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Backed out changeset: 24c470cccee0 - added SKIP_AUTORUN command flag...

meow-7.2.2
Tank_Master 2015-02-12 14:33:31 -08:00
parent 4794985d8d
commit 68c94399ed
1 changed files with 0 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
indra/newview/installers/windows/installer_template.nsi
View File

@ -105,7 +105,6 @@ 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_AUTORUN # Skip automatic launch of 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
@ -124,7 +123,6 @@ Var DO_UNINSTALL_V2 # If non-null, path to a previous Viewer 2 installation
Function .onInstSuccess
Call CheckWindowsServPack # Warn if not on the latest SP before asking to launch.
Push $R0 # Option value, unused
StrCmp $SKIP_AUTORUN "true" +2;
# Assumes SetOutPath $INSTDIR
Exec '"$INSTDIR\$INSTEXE" $SHORTCUT_LANG_PARAM'
Pop $R0
@ -785,10 +783,6 @@ 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