diff options
| author | Nat Goodspeed <nat@lindenlab.com> | 2019-02-05 14:35:36 -0500 |
|---|---|---|
| committer | Nat Goodspeed <nat@lindenlab.com> | 2019-02-05 14:35:36 -0500 |
| commit | d588660db1a1232731e3fb29eadc1c3951bf5dc3 (patch) | |
| tree | dbd7548baaa296a7a5df8be5957117cdba982b90 /indra/newview | |
| parent | 35bc6df9699da11c826843e4b81a0d0216e2ca54 (diff) | |
SL-10469: Remove any similar shortcuts for old per-user install.
Diffstat (limited to 'indra/newview')
| -rw-r--r-- | indra/newview/installers/windows/installer_template.nsi | 18 |
1 files changed, 18 insertions, 0 deletions
diff --git a/indra/newview/installers/windows/installer_template.nsi b/indra/newview/installers/windows/installer_template.nsi index 4afef4630c..8af0f057ae 100644 --- a/indra/newview/installers/windows/installer_template.nsi +++ b/indra/newview/installers/windows/installer_template.nsi @@ -602,6 +602,24 @@ RMDir /r "$INSTDIR\skins" Delete "$SMPROGRAMS\$INSTSHORTCUT\SL Release Notes.lnk"
Delete "$INSTDIR\releasenotes.txt"
+# SL-10469: During the brief period when the BugSplat RC supported "current
+# user" installs, we might have put a shortcut with this same $INSTSHORTCUT
+# name in the Start menu folder for "current user" programs. Even though we're
+# about to write our new shortcut to the Start menu folder for "all users,"
+# apparently Windows 7 only shows one of them. (Windows 10 reportedly shows
+# both.) Try temporarily setting "current user," just long enough to delete
+# any such old shortcuts.
+SetShellVarContext current
+
+# This stanza should match the $SMPROGRAMS and $DESKTOP deletions in the
+# "clean up shortcuts" passage in Section Uninstall. Don't bother with the
+# shortcuts in $INSTDIR because we're just about to (over)write those.
+Delete "$SMPROGRAMS\$INSTSHORTCUT\*.*"
+RMDir "$SMPROGRAMS\$INSTSHORTCUT"
+Delete "$DESKTOP\$INSTSHORTCUT.lnk"
+
+SetShellVarContext all
+
FunctionEnd
;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
|