- removed debug line from windows/specific.sh

- deinstalling Blender now also removes "%PROGRAMFILES%\Blender Foundation"
  if it's empty

diff --git a/release/windows/installer/00.blender.nsi b/release/windows/installer/00.blender.nsi
index 5dac3dfa1767e6ccc60c77d40d9766bbe0cd3cba..f1ecc18724181b29b495fc9d688c128935ab70a8 100644 (file)
--- a/release/windows/installer/00.blender.nsi
+++ b/release/windows/installer/00.blender.nsi
@@ -81,4 +81,5 @@ Section "Uninstall"
   RMDir "$SMPROGRAMS\Blender Foundation\Blender-VERSION"
   RMDir "$SMPROGRAMS\Blender Foundation"
   RMDir "$INSTDIR"
+  RMDir "$INSTDIR\.."
 SectionEnd

diff --git a/release/windows/specific.sh b/release/windows/specific.sh
index 79fe7c62ade6dfe56ced6fd3488b538b9dd5eb99..4be31114d47c0c35d84b78bc309ba906a5b257d1 100755 (executable)
--- a/release/windows/specific.sh
+++ b/release/windows/specific.sh
@@ -64,7 +64,6 @@ if (`test -x "$NSIS"`) then
     SHORTVERS=`echo $VERSION | sed 's/\.//'`
     # make a installer config for this release
     cat 00.blender.nsi | sed "s|VERSION|$VERSION|g" | sed "s|DISTDIR|$DISTDIR|g" | sed "s|SHORTVERS|$SHORTVERS|g" > $TEMPFILE
-    cat 00.blender.nsi | sed "s|VERSION|$VERSION|g" | sed "s|DISTDIR|$DISTDIR|g" | sed "s|SHORTVERS|$SHORTVERS|g" | less
     "$NSIS" $TEMPFILE
     rm $TEMPFILE
 fi