Some improvements to the uninstaller part:

* don't just recursively delete $BLENDERHOME
* seperately ask confirmation for recursive deleting contents of:
  - $BLENDERHOME\$SHORTVERSION\plugins
  - $BLENDERHOME\$SHORTVERSION\scripts
  - $BLENDERHOME\$SHORTVERSION\config
* Have clear warnings about files going to be deleted

1 files changed, 26 insertions, 11 deletions

diff --git a/release/windows/installer/00.sconsblender.nsi b/release/windows/installer/00.sconsblender.nsi
index d16e0f1ae61..4a6a2ca4d8a 100644
--- a/release/windows/installer/00.sconsblender.nsi
+++ b/release/windows/installer/00.sconsblender.nsi
@@ -188,7 +188,7 @@ Section "Open .blend files with Blender-[VERSION]" Section4
   

 SectionEnd

 

-UninstallText "This will uninstall Blender [VERSION], and all datafiles from the installation dir. Hit next to continue."

+UninstallText "This will uninstall Blender [VERSION], and all installed files. Before continuing make sure you have created backup of all the files you may want to keep: startup.blend, bookmarks.txt, recent-files.txt. Hit next to continue."

 

 Section "Uninstall"

   ; remove registry keys

@@ -197,23 +197,38 @@ Section "Uninstall"
   DeleteRegKey HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\Blender"

   DeleteRegKey HKLM "SOFTWARE\BlenderFoundation"

   SetShellVarContext all

-

-  StrCpy $0 "$SMPROGRAMS\Blender Foundation\"

-  MessageBox MB_OK $0

+ 

   ; remove files

   [DELROOTDIRCONTS]

 

+  ; remove bundled python

+  RmDir /r $INSTDIR\$SHORTVERSION\python

+

   Delete "$INSTDIR\uninstall.exe"

 

-  MessageBox MB_YESNO "Erase $BLENDERHOME? This includes all installed scripts and configuration files and any file you may have created there." IDNO Next

-  RMDir /r "$BLENDERHOME"

-Next:

-  ; remove shortcuts, if any.

+  MessageBox MB_YESNO "Recursively erase contents of $BLENDERHOME\$SHORTVERSION\scripts? NOTE: This includes all installed scripts and *any* file and directory you have manually created, installed later or copied. This also including .blend files." IDNO NextNoScriptRemove

+  RMDir /r "$BLENDERHOME\$SHORTVERSION\scripts"

+NextNoScriptRemove:

+  MessageBox MB_YESNO "Recursively erase contents from $BLENDERHOME\$SHORTVERSION\config? NOTE: This includes your startup.blend, bookmarks and any other file and directory you may have created in that directory" IDNO NextNoConfigRemove

+  RMDir /r "$BLENDERHOME\$SHORTVERSION\config"

+NextNoConfigRemove:

+  MessageBox MB_YESNO "Recursively erase contents from $BLENDERHOME\$SHORTVERSION\plugins? NOTE: This includes files and subdirectories in this directory" IDNO NextNoPluginRemove

+  RMDir /r "$BLENDERHOME\$SHORTVERSION\plugins"

+NextNoPluginRemove:

+  ; try to remove dirs, but leave them if they contain anything

+  RMDir "$BLENDERHOME\$SHORTVERSION\plugins"

+  RMDir "$BLENDERHOME\$SHORTVERSION\config"

+  RMDir "$BLENDERHOME\$SHORTVERSION\scripts"

+  RMDir "$BLENDERHOME\$SHORTVERSION"

+  RMDir "$BLENDERHOME"

+  ; remove shortcuts

+  Delete "$SMPROGRAMS\Blender Foundation\Blender\*.*"

   Delete "$DESKTOP\Blender.lnk"

   ; remove all link related directories and files

-  RMDir /r "$SMPROGRAMS\Blender Foundation\"

-  ; remove entire installation directory, including any file created by the user

-  RMDir /r "$INSTDIR"

+  RMDir "$SMPROGRAMS\Blender Foundation\Blender"

+  RMDir "$SMPROGRAMS\Blender Foundation"

+  ; Clear out installation dir

+  RMDir "$INSTDIR"

 SectionEnd

 

 !insertmacro MUI_FUNCTION_DESCRIPTION_BEGIN