From 5fef5f11ea3acb6936f9da21181dde3e5dfac6b7 Mon Sep 17 00:00:00 2001 From: Tank_Master Date: Tue, 17 Feb 2015 18:53:39 -0800 Subject: Made message asking to delete user data folder a little more clear. --- indra/newview/installers/windows/lang_en-us.nsi | Bin 8448 -> 8510 bytes 1 file changed, 0 insertions(+), 0 deletions(-) (limited to 'indra') diff --git a/indra/newview/installers/windows/lang_en-us.nsi b/indra/newview/installers/windows/lang_en-us.nsi index c06e5ac00d..343c312ddc 100755 Binary files a/indra/newview/installers/windows/lang_en-us.nsi and b/indra/newview/installers/windows/lang_en-us.nsi differ -- cgit v1.2.3 From 65c130a9a803eb40ea5d7510faef86aacb556e53 Mon Sep 17 00:00:00 2001 From: Tank_Master Date: Tue, 17 Feb 2015 18:55:00 -0800 Subject: Move prompt and processing the deletion of user settings to end of uninstall. --- indra/newview/installers/windows/installer_template.nsi | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) (limited to 'indra') diff --git a/indra/newview/installers/windows/installer_template.nsi b/indra/newview/installers/windows/installer_template.nsi index 83c364ff7e..1d6bde0052 100755 --- a/indra/newview/installers/windows/installer_template.nsi +++ b/indra/newview/installers/windows/installer_template.nsi @@ -348,7 +348,7 @@ StrCpy $INSTEXE "${INSTEXE}" StrCpy $INSTSHORTCUT "${SHORTCUT}" # Make sure the user can install/uninstall -Call un.CheckIfAdministrator +Call un.CheckIfAdministrator # Uninstall for all users (if you change this, change it in the install as well) SetShellVarContext all @@ -370,13 +370,13 @@ Delete "$DESKTOP\$INSTSHORTCUT.lnk" Delete "$INSTDIR\$INSTSHORTCUT.lnk" Delete "$INSTDIR\Uninstall $INSTSHORTCUT.lnk" -# Clean up cache and log files, but leave them in-place for non AGNI installs. -Call un.UserSettingsFiles - # Remove the main installation directory Call un.ProgramFiles -SectionEnd +# Clean up cache and log files, but leave them in-place for non AGNI installs. +Call un.UserSettingsFiles + +SectionEnd ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; ;; Make sure the user can install @@ -734,7 +734,7 @@ FunctionEnd ; EnumRegKey $1 HKEY_LOCAL_MACHINE "SOFTWARE\Microsoft\Windows NT\CurrentVersion\ProfileList" $0 ; StrCmp $1 "" DONE # no more users ; -; ReadRegStr $2 HKEY_LOCAL_MACHINE "SOFTWARE\Microsoft\Windows NT\CurrentVersion\ProfileList\$1" "ProfileImagePath" +; ReadRegStr $2 HKEY_LOCAL_MACHINE "SOFTWARE\Microsoft\Windows NT\CurrentVersion\ProfileList\$1" "ProfileImagePath" ; StrCmp $2 "" CONTINUE 0 # "ProfileImagePath" value is missing ; ;# Required since ProfileImagePath is of type REG_EXPAND_SZ -- cgit v1.2.3 From 412bfd9edc3000a143f8757d1f97f9bac79f33fc Mon Sep 17 00:00:00 2001 From: Tank_Master Date: Tue, 17 Feb 2015 18:55:56 -0800 Subject: opps, let's make the deletion of the help directory recursive --- indra/newview/installers/windows/installer_template.nsi | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'indra') diff --git a/indra/newview/installers/windows/installer_template.nsi b/indra/newview/installers/windows/installer_template.nsi index 1d6bde0052..509b4f6d84 100755 --- a/indra/newview/installers/windows/installer_template.nsi +++ b/indra/newview/installers/windows/installer_template.nsi @@ -654,7 +654,7 @@ Delete "$INSTDIR\SecondLife.exe" Delete "$INSTDIR\VivoxVoiceService-*.log" # Remove entire help directory -RMDir "$INSTDIR\help" +RMDir /r "$INSTDIR\help" Delete "$INSTDIR\uninst.exe" RMDir "$INSTDIR" -- cgit v1.2.3 From d4a99c46a411aca038d8bccaf2098f8eeae3a267 Mon Sep 17 00:00:00 2001 From: maksymsproductengine Date: Wed, 8 Jan 2014 20:25:40 +0200 Subject: MAINT-3591 FIXED Remove "Start Second LIfe now?" dialogue in the installer --- indra/newview/installers/windows/installer_template.nsi | 15 --------------- 1 file changed, 15 deletions(-) (limited to 'indra') diff --git a/indra/newview/installers/windows/installer_template.nsi b/indra/newview/installers/windows/installer_template.nsi index 509b4f6d84..20623ced84 100755 --- a/indra/newview/installers/windows/installer_template.nsi +++ b/indra/newview/installers/windows/installer_template.nsi @@ -676,24 +676,9 @@ FunctionEnd Function .onInstSuccess Call CheckWindowsServPack # Warn if not on the latest SP before asking to launch. Push $R0 # Option value, unused - - StrCmp $SKIP_DIALOGS "true" label_launch - - ${GetOptions} $COMMANDLINE "/AUTOSTART" $R0 - # If parameter was there (no error) just launch - # Otherwise ask - IfErrors label_ask_launch label_launch - -label_ask_launch: - # Don't launch by default when silent - IfSilent label_no_launch - MessageBox MB_YESNO $(InstSuccesssQuestion) \ - IDYES label_launch IDNO label_no_launch -label_launch: # Assumes SetOutPath $INSTDIR Exec '"$WINDIR\explorer.exe" "$INSTDIR\$INSTEXE"' -label_no_launch: Pop $R0 FunctionEnd -- cgit v1.2.3 From 7555596c44a85ecbfe823fc8dea33cb01a7b89dd Mon Sep 17 00:00:00 2001 From: Richard Linden Date: Tue, 8 Apr 2014 16:01:46 -0700 Subject: added SKIP_AUTORUN command line flag to disable automatically running viewer after install --- indra/newview/installers/windows/installer_template.nsi | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) (limited to 'indra') 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 -- cgit v1.2.3