reactos/RosBE
1
0
Fork 0
mirror of https://github.com/reactos/RosBE.git synced 2024-10-07 00:43:20 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

[ROSBE] Fix removal of desktop shortcuts on uninstall. No good idea to remove from current user while the shortcuts are on public desktop... Fix removal of a few shortcuts even if you say NO on uninstall.

Browse Source
This commit is contained in:
Daniel Reimer 2019-04-27 21:15:04 +02:00
parent 95a59001c3
commit fba1f0a995
1 changed files with 7 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
RosBE-Windows/RosBE.nsi
View File

@ -113,7 +113,6 @@ Section -BaseFiles SEC01
;; Make the directory "$INSTDIR" read write accessible by all users ;; Make the directory "$INSTDIR" read write accessible by all users
AccessControl::GrantOnFile "$INSTDIR" "(BU)" "FullAccess" AccessControl::GrantOnFile "$INSTDIR" "(BU)" "FullAccess"
SetShellVarContext current
SetOutPath "$INSTDIR" SetOutPath "$INSTDIR"
SetOverwrite try SetOverwrite try
File /r Icons\rosbe.ico File /r Icons\rosbe.ico
@ -213,14 +212,12 @@ Section -BaseFiles SEC01
SectionEnd SectionEnd
Section -MinGWGCC SEC02 Section -MinGWGCC SEC02
SetShellVarContext current
SetOutPath "$INSTDIR\i386" SetOutPath "$INSTDIR\i386"
SetOverwrite try SetOverwrite try
File /r Components\i386\*.* File /r Components\i386\*.*
SectionEnd SectionEnd
Section /o "AMD64 Compiler" SEC03 Section /o "AMD64 Compiler" SEC03
SetShellVarContext current
SetOutPath "$INSTDIR\amd64" SetOutPath "$INSTDIR\amd64"
SetOverwrite try SetOverwrite try
File /r Components\amd64\*.* File /r Components\amd64\*.*
@ -231,7 +228,6 @@ Section /o "Add BIN folder to PATH variable (MSVC users)" SEC04
SectionEnd SectionEnd
Section /o "Update for GlobalSign Certificates (XP users NEED THAT)" SEC05 Section /o "Update for GlobalSign Certificates (XP users NEED THAT)" SEC05
SetShellVarContext current
SetOutPath "$INSTDIR\certs" SetOutPath "$INSTDIR\certs"
SetOverwrite try SetOverwrite try
File /r Components\certs\Root-E46.crt File /r Components\certs\Root-E46.crt
@ -280,7 +276,6 @@ Section /o "Update for GlobalSign Certificates (XP users NEED THAT)" SEC05
SectionEnd SectionEnd
Section /o "PowerShell Version" SEC06 Section /o "PowerShell Version" SEC06
SetShellVarContext current
SetOutPath "$INSTDIR" SetOutPath "$INSTDIR"
SetOverwrite try SetOverwrite try
File /r Components\Powershell\Build.ps1 File /r Components\Powershell\Build.ps1
@ -309,7 +304,6 @@ Section /o "PowerShell Version" SEC06
SectionEnd SectionEnd
Section -StartMenuShortcuts SEC07 Section -StartMenuShortcuts SEC07
SetShellVarContext current
;; ;;
;; Add our start menu shortcuts. ;; Add our start menu shortcuts.
@ -322,7 +316,7 @@ Section -StartMenuShortcuts SEC07
CreateShortCut "$SMPROGRAMS\$ICONS_GROUP\ReactOS Build Environment ${PRODUCT_VERSION}.lnk" "$SYSDIR\cmd.exe" '/t:0A /k "$INSTDIR\RosBE.cmd"' "$INSTDIR\rosbe.ico" CreateShortCut "$SMPROGRAMS\$ICONS_GROUP\ReactOS Build Environment ${PRODUCT_VERSION}.lnk" "$SYSDIR\cmd.exe" '/t:0A /k "$INSTDIR\RosBE.cmd"' "$INSTDIR\rosbe.ico"
IfFileExists "$INSTDIR\RosBE.ps1" 0 +2 IfFileExists "$INSTDIR\RosBE.ps1" 0 +2
CreateShortCut "$SMPROGRAMS\$ICONS_GROUP\ReactOS Build Environment ${PRODUCT_VERSION} - PS.lnk" "$SYSDIR\WindowsPowerShell\v1.0\powershell.exe" "-noexit &'$INSTDIR\RosBE.ps1'" "$INSTDIR\rosbe.ico" CreateShortCut "$SMPROGRAMS\$ICONS_GROUP\ReactOS Build Environment ${PRODUCT_VERSION} - PS.lnk" "$SYSDIR\WindowsPowerShell\v1.0\powershell.exe" "-noexit &'$INSTDIR\RosBE.ps1'" "$INSTDIR\rosbe.ico"
IfFileExists "$INSTDIR\amd64\*" 0 +6 IfFileExists "$INSTDIR\amd64\*" 0 +5
IfFileExists "$INSTDIR\RosBE.cmd" 0 +2 IfFileExists "$INSTDIR\RosBE.cmd" 0 +2
CreateShortCut "$SMPROGRAMS\$ICONS_GROUP\ReactOS Build Environment ${PRODUCT_VERSION} AMD64.lnk" "$SYSDIR\cmd.exe" '/t:0A /k "$INSTDIR\RosBE.cmd" amd64' "$INSTDIR\rosbe.ico" CreateShortCut "$SMPROGRAMS\$ICONS_GROUP\ReactOS Build Environment ${PRODUCT_VERSION} AMD64.lnk" "$SYSDIR\cmd.exe" '/t:0A /k "$INSTDIR\RosBE.cmd" amd64' "$INSTDIR\rosbe.ico"
IfFileExists "$INSTDIR\RosBE.ps1" 0 +2 IfFileExists "$INSTDIR\RosBE.ps1" 0 +2
@ -338,18 +332,17 @@ Section -StartMenuShortcuts SEC07
SectionEnd SectionEnd
Section /o "Desktop Shortcuts" SEC08 Section /o "Desktop Shortcuts" SEC08
SetShellVarContext all
;; ;;
;; Add our desktop shortcuts. ;; Add our desktop shortcuts.
;; ;;
IfFileExists "$DESKTOP\ReactOS Build Environment ${PRODUCT_VERSION}.lnk" +12 0 IfFileExists "$DESKTOP\ReactOS Build Environment ${PRODUCT_VERSION}.lnk" +11 0
SetOutPath $REACTOS_SOURCE_DIRECTORY SetOutPath $REACTOS_SOURCE_DIRECTORY
IfFileExists "$INSTDIR\RosBE.cmd" 0 +2 IfFileExists "$INSTDIR\RosBE.cmd" 0 +2
CreateShortCut "$DESKTOP\ReactOS Build Environment ${PRODUCT_VERSION}.lnk" "$SYSDIR\cmd.exe" '/t:0A /k "$INSTDIR\RosBE.cmd"' "$INSTDIR\rosbe.ico" CreateShortCut "$DESKTOP\ReactOS Build Environment ${PRODUCT_VERSION}.lnk" "$SYSDIR\cmd.exe" '/t:0A /k "$INSTDIR\RosBE.cmd"' "$INSTDIR\rosbe.ico"
IfFileExists "$INSTDIR\RosBE.ps1" 0 +2 IfFileExists "$INSTDIR\RosBE.ps1" 0 +2
CreateShortCut "$DESKTOP\ReactOS Build Environment ${PRODUCT_VERSION} - PS.lnk" "$SYSDIR\WindowsPowerShell\v1.0\powershell.exe" "-noexit &'$INSTDIR\RosBE.ps1'" "$INSTDIR\rosbe.ico" CreateShortCut "$DESKTOP\ReactOS Build Environment ${PRODUCT_VERSION} - PS.lnk" "$SYSDIR\WindowsPowerShell\v1.0\powershell.exe" "-noexit &'$INSTDIR\RosBE.ps1'" "$INSTDIR\rosbe.ico"
IfFileExists "$INSTDIR\amd64\*" 0 +6 IfFileExists "$INSTDIR\amd64\*" 0 +5
IfFileExists "$INSTDIR\RosBE.cmd" 0 +2 IfFileExists "$INSTDIR\RosBE.cmd" 0 +2
CreateShortCut "$DESKTOP\ReactOS Build Environment ${PRODUCT_VERSION} AMD64.lnk" "$SYSDIR\cmd.exe" '/t:0A /k "$INSTDIR\RosBE.cmd" amd64' "$INSTDIR\rosbe.ico" CreateShortCut "$DESKTOP\ReactOS Build Environment ${PRODUCT_VERSION} AMD64.lnk" "$SYSDIR\cmd.exe" '/t:0A /k "$INSTDIR\RosBE.cmd" amd64' "$INSTDIR\rosbe.ico"
IfFileExists "$INSTDIR\RosBE.ps1" 0 +2 IfFileExists "$INSTDIR\RosBE.ps1" 0 +2
@ -357,18 +350,17 @@ Section /o "Desktop Shortcuts" SEC08
SectionEnd SectionEnd
Section /o "Quick Launch Shortcuts" SEC09 Section /o "Quick Launch Shortcuts" SEC09
SetShellVarContext current
;; ;;
;; Add our quick launch shortcuts. ;; Add our quick launch shortcuts.
;; ;;
IfFileExists "$QUICKLAUNCH\ReactOS Build Environment ${PRODUCT_VERSION}.lnk" +12 0 IfFileExists "$QUICKLAUNCH\ReactOS Build Environment ${PRODUCT_VERSION}.lnk" +11 0
SetOutPath $REACTOS_SOURCE_DIRECTORY SetOutPath $REACTOS_SOURCE_DIRECTORY
IfFileExists "$INSTDIR\RosBE.cmd" 0 +2 IfFileExists "$INSTDIR\RosBE.cmd" 0 +2
CreateShortCut "$QUICKLAUNCH\ReactOS Build Environment ${PRODUCT_VERSION}.lnk" "$SYSDIR\cmd.exe" '/t:0A /k "$INSTDIR\RosBE.cmd"' "$INSTDIR\rosbe.ico" CreateShortCut "$QUICKLAUNCH\ReactOS Build Environment ${PRODUCT_VERSION}.lnk" "$SYSDIR\cmd.exe" '/t:0A /k "$INSTDIR\RosBE.cmd"' "$INSTDIR\rosbe.ico"
IfFileExists "$INSTDIR\RosBE.ps1" 0 +2 IfFileExists "$INSTDIR\RosBE.ps1" 0 +2
CreateShortCut "$QUICKLAUNCH\ReactOS Build Environment ${PRODUCT_VERSION} - PS.lnk" "$SYSDIR\WindowsPowerShell\v1.0\powershell.exe" "-noexit &'$INSTDIR\RosBE.ps1'" "$INSTDIR\rosbe.ico" CreateShortCut "$QUICKLAUNCH\ReactOS Build Environment ${PRODUCT_VERSION} - PS.lnk" "$SYSDIR\WindowsPowerShell\v1.0\powershell.exe" "-noexit &'$INSTDIR\RosBE.ps1'" "$INSTDIR\rosbe.ico"
IfFileExists "$INSTDIR\amd64\*" 0 +6 IfFileExists "$INSTDIR\amd64\*" 0 +5
IfFileExists "$INSTDIR\RosBE.cmd" 0 +2 IfFileExists "$INSTDIR\RosBE.cmd" 0 +2
CreateShortCut "$QUICKLAUNCH\ReactOS Build Environment ${PRODUCT_VERSION} AMD64.lnk" "$SYSDIR\cmd.exe" '/t:0A /k "$INSTDIR\RosBE.cmd" amd64' "$INSTDIR\rosbe.ico" CreateShortCut "$QUICKLAUNCH\ReactOS Build Environment ${PRODUCT_VERSION} AMD64.lnk" "$SYSDIR\cmd.exe" '/t:0A /k "$INSTDIR\RosBE.cmd" amd64' "$INSTDIR\rosbe.ico"
IfFileExists "$INSTDIR\RosBE.ps1" 0 +2 IfFileExists "$INSTDIR\RosBE.ps1" 0 +2
@ -394,14 +386,14 @@ Function un.onInit
"Are you sure you want to remove ReactOS Build Environment and all of its components?" \ "Are you sure you want to remove ReactOS Build Environment and all of its components?" \
IDYES +2 IDYES +2
Abort Abort
IfFileExists "$APPDATA\RosBE\." 0 +5 IfFileExists "$APPDATA\RosBE\." 0 +3
MessageBox MB_ICONQUESTION|MB_YESNO|MB_DEFBUTTON2 \ MessageBox MB_ICONQUESTION|MB_YESNO|MB_DEFBUTTON2 \
"Do you want to remove the ReactOS Build Environment configuration file from the Application Data Path?" \ "Do you want to remove the ReactOS Build Environment configuration file from the Application Data Path?" \
IDNO +2 IDNO +2
RMDir /r /REBOOTOK "$APPDATA\RosBE" RMDir /r /REBOOTOK "$APPDATA\RosBE"
MessageBox MB_ICONQUESTION|MB_YESNO|MB_DEFBUTTON2 \ MessageBox MB_ICONQUESTION|MB_YESNO|MB_DEFBUTTON2 \
"Do you want to remove the Shortcuts? If you just want to Update to a new Version of RosBE, keep them. This keeps your previous settings." \ "Do you want to remove the Shortcuts? If you just want to Update to a new Version of RosBE, keep them. This keeps your previous settings." \
IDNO +5 IDNO +9
Delete /REBOOTOK "$DESKTOP\ReactOS Build Environment ${PRODUCT_VERSION}.lnk" Delete /REBOOTOK "$DESKTOP\ReactOS Build Environment ${PRODUCT_VERSION}.lnk"
Delete /REBOOTOK "$QUICKLAUNCH\ReactOS Build Environment ${PRODUCT_VERSION}.lnk" Delete /REBOOTOK "$QUICKLAUNCH\ReactOS Build Environment ${PRODUCT_VERSION}.lnk"
Delete /REBOOTOK "$DESKTOP\ReactOS Build Environment ${PRODUCT_VERSION} - PS.lnk" Delete /REBOOTOK "$DESKTOP\ReactOS Build Environment ${PRODUCT_VERSION} - PS.lnk"
@ -414,7 +406,6 @@ FunctionEnd
Section Uninstall Section Uninstall
!insertmacro MUI_STARTMENU_GETFOLDER "Application" $ICONS_GROUP !insertmacro MUI_STARTMENU_GETFOLDER "Application" $ICONS_GROUP
SetShellVarContext current
;; ;;
;; Clean up PATH Variable. ;; Clean up PATH Variable.