Mercurial > mxe-octave

comparison tools/makeinst-script.sh.in @ 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 f654b70b6a6e
comparison
equal deleted inserted replaced
6396:d5e6775fb3bc 6397:10d35dbdf84b
349 349
350 Var UninstallLocalPackages 350 Var UninstallLocalPackages
351 Var UninstallLocalPackagesCtrl 351 Var UninstallLocalPackagesCtrl
352 Var UninstallUserSettings 352 Var UninstallUserSettings
353 Var UninstallUserSettingsCtrl 353 Var UninstallUserSettingsCtrl
354 #Var UninstallAppDirCtrl
355 Var UninstallAppDir
354 356
355 Function un.octaveOptionsPage 357 Function un.octaveOptionsPage
356 358
357 nsDialogs::Create 1018 359 nsDialogs::Create 1018
358 Pop \$0 360 Pop \$0
366 \${NSD_SetState} \$UninstallLocalPackagesCtrl \$UninstallLocalPackages 368 \${NSD_SetState} \$UninstallLocalPackagesCtrl \$UninstallLocalPackages
367 369
368 \${NSD_CreateCheckBox} 0 20u 100% 12u "Remove user settings" 370 \${NSD_CreateCheckBox} 0 20u 100% 12u "Remove user settings"
369 Pop \$UninstallUserSettingsCtrl 371 Pop \$UninstallUserSettingsCtrl
370 \${NSD_SetState} \$UninstallUserSettingsCtrl \$UninstallUserSettings 372 \${NSD_SetState} \$UninstallUserSettingsCtrl \$UninstallUserSettings
373
374 #\${NSD_CreateLabel} 0 40u 110u 12u "\$UninstallAppDir"
375 #Pop \$UninstallAppDirCtrl
371 376
372 !insertmacro MUI_HEADER_TEXT "Uninstall Options" "Choose additional options for uninstalling" 377 !insertmacro MUI_HEADER_TEXT "Uninstall Options" "Choose additional options for uninstalling"
373 nsDialogs::Show 378 nsDialogs::Show
374 Pop \$0 379 Pop \$0
375 FunctionEnd 380 FunctionEnd
404 # if 1 was local only 409 # if 1 was local only
405 StrCmp \$R0 1 0 uninst_set_admin 410 StrCmp \$R0 1 0 uninst_set_admin
406 411
407 Call un.MultiUser.InstallMode.CurrentUser 412 Call un.MultiUser.InstallMode.CurrentUser
408 413
414 # store current user app data dir
415 StrCpy \$UninstallAppDir "\$APPDATA"
416
409 GoTo uninst_cont_un 417 GoTo uninst_cont_un
410 418
411 uninst_set_admin: 419 uninst_set_admin:
420 # store current user app data dir
421 Call un.MultiUser.InstallMode.CurrentUser
422 StrCpy \$UninstallAppDir "\$APPDATA"
423
412 # if 2, was a allusers install 424 # if 2, was a allusers install
413 Call un.MultiUser.InstallMode.AllUsers 425 Call un.MultiUser.InstallMode.AllUsers
414 426
415 uninst_cont_un: 427 uninst_cont_un:
416 428
686 698
687 Section "Uninstall" 699 Section "Uninstall"
688 700
689 ; remove user uninstall stuff if options chosen 701 ; remove user uninstall stuff if options chosen
690 \${If} \$UninstallLocalPackages == 1 702 \${If} \$UninstallLocalPackages == 1
691 \${If} \${FileExists} "\$APPDATA\\octave\\api-v$OCTAVE_API_VERSION" 703 \${If} \${FileExists} "\$UninstallAppDir\\octave\\api-v$OCTAVE_API_VERSION"
692 RMDir /r "\$APPDATA\\octave\\api-v$OCTAVE_API_VERSION" 704 RMDir /r "\$UninstallAppDir\\octave\\api-v$OCTAVE_API_VERSION"
693 \${EndIf} 705 \${EndIf}
694 ClearErrors 706 ClearErrors
695 \${EndIf} 707 \${EndIf}
696 708
697 \${If} \$UninstallUserSettings == 1 709 \${If} \$UninstallUserSettings == 1
698 \${If} \${FileExists} "\$APPDATA\\octave" 710 \${If} \${FileExists} "\$UninstallAppDir\\octave"
699 Delete "\$APPDATA\\octave\\octave-gui.ini" 711 Delete "\$UninstallAppDir\\octave\\octave-gui.ini"
700 Delete "\$APPDATA\\octave\\octave-doc-bookmarks.xbel" 712 Delete "\$UninstallAppDir\\octave\\octave-doc-bookmarks.xbel"
701 Delete "\$APPDATA\\octave\\history" 713 Delete "\$UninstallAppDir\\octave\\history"
702 RMDir "\$APPDATA\\octave" 714 RMDir "\$UninstallAppDir\\octave"
703 \${EndIf} 715 \${EndIf}
704 ClearErrors 716 ClearErrors
705 \${EndIf} 717 \${EndIf}
706 718
707 ReadRegDWORD \$0 \${PRODUCT_UNINST_ROOT_KEY} "\$MultiUser.UninstallKey" "RegisteredFileType" 719 ReadRegDWORD \$0 \${PRODUCT_UNINST_ROOT_KEY} "\$MultiUser.UninstallKey" "RegisteredFileType"