Skip to content

Commit 058f0ea

Browse files
committed
Fix start menu shortcut uninstall step
Allow the nsis installer to save the selected folder name in the registry
1 parent 4991cc3 commit 058f0ea

File tree

2 files changed

+10
-2
lines changed

2 files changed

+10
-2
lines changed

scripts/windows/orange-conda.nsi

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -171,6 +171,10 @@ Var StartMenuFolder
171171
# - no check box to enable/disable start menu creation
172172
# (is controled by the Components Page)
173173
!define MUI_STARTMENUPAGE_NODISABLE
174+
# Registry key path where the selected start folder name is stored
175+
!define MUI_STARTMENUPAGE_REGISTRY_ROOT SHELL_CONTEXT
176+
!define MUI_STARTMENUPAGE_REGISTRY_KEY ${INSTALL_SETTINGS_KEY}
177+
!define MUI_STARTMENUPAGE_REGISTRY_VALUENAME StartMenuFolder
174178
!insertmacro MUI_PAGE_STARTMENU StartMenuPageID $StartMenuFolder
175179

176180
# Install Files page:
@@ -749,8 +753,8 @@ Section Uninstall
749753
${LogWrite} " PythonPrefix: $PythonPrefix"
750754
${LogWrite} " BasePythonPrefix: $BasePythonPrefix"
751755
752-
Call un.Register
753756
Call un.Shortcuts
757+
Call un.Register
754758
Call un.Launchers
755759
Call un.InstallPackages
756760
Call un.Environment

scripts/windows/orange-install.nsi

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -189,6 +189,10 @@ Var StartMenuFolder
189189
# - no check box to enable/disable start menu creation
190190
# (is controled by the Components Page)
191191
!define MUI_STARTMENUPAGE_NODISABLE
192+
# Registry key path where the selected start folder name is stored
193+
!define MUI_STARTMENUPAGE_REGISTRY_ROOT SHELL_CONTEXT
194+
!define MUI_STARTMENUPAGE_REGISTRY_KEY ${INSTALL_SETTINGS_KEY}
195+
!define MUI_STARTMENUPAGE_REGISTRY_VALUENAME StartMenuFolder
192196
!insertmacro MUI_PAGE_STARTMENU StartMenuPageID $StartMenuFolder
193197

194198
# Install Files page:
@@ -783,8 +787,8 @@ Section Uninstall
783787
${LogWrite} " PythonPrefix: $PythonPrefix"
784788
${LogWrite} " BasePythonPrefix: $BasePythonPrefix"
785789
786-
Call un.Register
787790
Call un.Shortcuts
791+
Call un.Register
788792
Call un.Launchers
789793
Call un.InstallPackages
790794
Call un.Environment

0 commit comments

Comments
 (0)