Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-08-09 20:23:06 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

remove any old admin desktop/sm shortcuts

Browse source
This commit is contained in:
Stephen Birarda 2016-01-25 15:57:42 -08:00
parent eabafa800c
commit 9d4b529223
1 changed files with 18 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
cmake/templates/NSIS.template.in
View file

@ -432,12 +432,21 @@ Section "-Core installation"
!insertmacro MUI_STARTMENU_WRITE_BEGIN Application !insertmacro MUI_STARTMENU_WRITE_BEGIN Application
;Create shortcuts ;Create shortcuts
; in case the user has any shortcuts from prior to when we were using the user context, remove those now
SetShellVarContext all
RMDir /r "$SMPROGRAMS\$STARTMENU_FOLDER"
; go back to current user context before setting up the startmenu folder
SetShellVarContext current
CreateDirectory "$SMPROGRAMS\$STARTMENU_FOLDER" CreateDirectory "$SMPROGRAMS\$STARTMENU_FOLDER"
@CPACK_NSIS_CREATE_ICONS@ @CPACK_NSIS_CREATE_ICONS@
@CPACK_NSIS_CREATE_ICONS_EXTRA@ @CPACK_NSIS_CREATE_ICONS_EXTRA@
; Conditional handling for Interface specific options ; Conditional handling for Interface specific options
${If} ${SectionIsSelected} ${@CLIENT_COMPONENT_NAME@} ${If} ${SectionIsSelected} ${@CLIENT_COMPONENT_NAME@}
CreateShortCut "$SMPROGRAMS\$STARTMENU_FOLDER\@INTERFACE_SHORTCUT_NAME@.lnk" \ CreateShortCut "$SMPROGRAMS\$STARTMENU_FOLDER\@INTERFACE_SHORTCUT_NAME@.lnk" \
"$INSTDIR\@INTERFACE_WIN_EXEC_NAME@" "$INSTDIR\@INTERFACE_WIN_EXEC_NAME@"
@ -592,6 +601,15 @@ Var LaunchNowState
Var CopyFromProductionState Var CopyFromProductionState
Function HandlePostInstallOptions Function HandlePostInstallOptions
; If the user created shortcuts from a time prior to when we using current user context, pull them now
SetShellVarContext all
Delete "$DESKTOP\@INTERFACE_SHORTCUT_NAME@.lnk"
Delete "$DESKTOP\@CONSOLE_SHORTCUT_NAME@.lnk"
; return the context to the current user so the shortcuts are correct
SetShellVarContext current
${If} ${SectionIsSelected} ${@CLIENT_COMPONENT_NAME@} ${If} ${SectionIsSelected} ${@CLIENT_COMPONENT_NAME@}
; check if the user asked for a desktop shortcut to High Fidelity ; check if the user asked for a desktop shortcut to High Fidelity
${NSD_GetState} $DesktopClientCheckbox $DesktopClientState ${NSD_GetState} $DesktopClientCheckbox $DesktopClientState