From 5fd9fee356d82624e6f240ffae4341c027ea5fac Mon Sep 17 00:00:00 2001 From: Ansariel Date: Tue, 30 Oct 2012 14:34:37 +0100 Subject: [PATCH] Expose "Details" button in Windows installer and allow review of installation --- .../installers/windows/installer_template.nsi | 13 ++++++++++--- 1 file changed, 10 insertions(+), 3 deletions(-) diff --git a/indra/newview/installers/windows/installer_template.nsi b/indra/newview/installers/windows/installer_template.nsi index 690fe67caa..0139dd2c18 100644 --- a/indra/newview/installers/windows/installer_template.nsi +++ b/indra/newview/installers/windows/installer_template.nsi @@ -99,9 +99,11 @@ WindowIcon on ; show our icon in left corner BGGradient off ; no big background window CRCCheck on ; make sure CRC is OK InstProgressFlags smooth colored ; new colored smooth look -ShowInstDetails nevershow ; no details, no "show" button +; Expose details button (details hidden by default) +;ShowInstDetails nevershow ; no details, no "show" button SetOverwrite on ; stomp files by default -AutoCloseWindow true ; after all files install, close window +; Don't auto-close so we can check details +;AutoCloseWindow true ; after all files install, close window InstallDir "$PROGRAMFILES\${INSTNAME}" InstallDirRegKey HKEY_LOCAL_MACHINE "SOFTWARE\The Phoenix Viewer Project\${INSTNAME}" "" @@ -877,8 +879,13 @@ Function .onInit ${GetParameters} $COMMANDLINE ; get our command line ${GetOptions} $COMMANDLINE "/SKIP_DIALOGS" $0 - IfErrors +2 0 ; If error jump past setting SKIP_DIALOGS + ; Auto-close if auto-updating + ; IfErrors +2 0 ; If error jump past setting SKIP_DIALOGS + ; StrCpy $SKIP_DIALOGS "true" + IfErrors +3 0 ; If error jump past setting SKIP_DIALOGS StrCpy $SKIP_DIALOGS "true" + SetAutoClose true + ; ${GetOptions} $COMMANDLINE "/LANGID=" $0 ; /LANGID=1033 implies US English ; If no language (error), then proceed