Mercurial > mxe-octave

changeset 6397:10d35dbdf84b release

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
* tools/makeinst-script.sh.in: use users appdir for removal of settings (Bug #62352) (grafted from eb58a62c878e1fac2515b0ec7c7c361ae69e0bc5)
author John Donoghue <john.donoghue@ieee.org>
date Sat, 03 Sep 2022 18:33:31 -0400
parents d5e6775fb3bc
children e9fc3d04f1dd 032096a9741e
files tools/makeinst-script.sh.in
diffstat 1 files changed, 19 insertions(+), 7 deletions(-) [+]
line wrap: on
line diff
--- a/tools/makeinst-script.sh.in	Wed Aug 31 08:09:19 2022 -0400
+++ b/tools/makeinst-script.sh.in	Sat Sep 03 18:33:31 2022 -0400
@@ -351,6 +351,8 @@
 Var UninstallLocalPackagesCtrl
 Var UninstallUserSettings
 Var UninstallUserSettingsCtrl
+#Var UninstallAppDirCtrl
+Var UninstallAppDir
 
 Function un.octaveOptionsPage 
 
@@ -369,6 +371,9 @@
   Pop \$UninstallUserSettingsCtrl
   \${NSD_SetState} \$UninstallUserSettingsCtrl \$UninstallUserSettings
 
+  #\${NSD_CreateLabel} 0 40u 110u 12u "\$UninstallAppDir"
+  #Pop \$UninstallAppDirCtrl
+
   !insertmacro MUI_HEADER_TEXT "Uninstall Options" "Choose additional options for uninstalling"
   nsDialogs::Show  
   Pop \$0
@@ -406,9 +411,16 @@
 
   Call un.MultiUser.InstallMode.CurrentUser
 
+  # store current user app data dir
+  StrCpy \$UninstallAppDir "\$APPDATA"
+
   GoTo uninst_cont_un
 
 uninst_set_admin:
+  # store current user app data dir
+  Call un.MultiUser.InstallMode.CurrentUser
+  StrCpy \$UninstallAppDir "\$APPDATA"
+
   # if 2, was a allusers install
   Call un.MultiUser.InstallMode.AllUsers
 
@@ -688,18 +700,18 @@
 
   ; remove user uninstall stuff if options chosen
   \${If} \$UninstallLocalPackages == 1
-    \${If} \${FileExists} "\$APPDATA\\octave\\api-v$OCTAVE_API_VERSION"
-      RMDir /r "\$APPDATA\\octave\\api-v$OCTAVE_API_VERSION"
+    \${If} \${FileExists} "\$UninstallAppDir\\octave\\api-v$OCTAVE_API_VERSION"
+      RMDir /r "\$UninstallAppDir\\octave\\api-v$OCTAVE_API_VERSION"
     \${EndIf}
     ClearErrors
   \${EndIf}
 
   \${If} \$UninstallUserSettings == 1
-    \${If} \${FileExists} "\$APPDATA\\octave"
-      Delete "\$APPDATA\\octave\\octave-gui.ini"
-      Delete "\$APPDATA\\octave\\octave-doc-bookmarks.xbel"
-      Delete "\$APPDATA\\octave\\history"
-      RMDir "\$APPDATA\\octave"
+    \${If} \${FileExists} "\$UninstallAppDir\\octave"
+      Delete "\$UninstallAppDir\\octave\\octave-gui.ini"
+      Delete "\$UninstallAppDir\\octave\\octave-doc-bookmarks.xbel"
+      Delete "\$UninstallAppDir\\octave\\history"
+      RMDir "\$UninstallAppDir\\octave"
     \${EndIf}
     ClearErrors
   \${EndIf}