[or-cvs] r19049: {torvm} Forgot the uninstaller script. (in torvm/trunk/build/win32: . files src/pkg)

[coderman at seul.org]

Author: coderman
Date: 2009-03-16 09:19:51 -0400 (Mon, 16 Mar 2009)
New Revision: 19049

Added:
   torvm/trunk/build/win32/files/uninstall.bat
Modified:
   torvm/trunk/build/win32/Makefile
   torvm/trunk/build/win32/files/buildall.sh
   torvm/trunk/build/win32/src/pkg/bundle.nsi
   torvm/trunk/build/win32/src/pkg/netinst.nsi
Log:
Forgot the uninstaller script.

Modified: torvm/trunk/build/win32/Makefile
===================================================================
--- torvm/trunk/build/win32/Makefile	2009-03-16 13:05:33 UTC (rev 19048)
+++ torvm/trunk/build/win32/Makefile	2009-03-16 13:19:51 UTC (rev 19049)
@@ -348,6 +348,7 @@
 	echo "--- Copying packages for ISO image file system ..."; \
 	cp files/autorun.inf files/install.bat $(ISODIR)/; \
 	cp files/*.vbs $(ISODIR)/bin/; \
+	cp files/uninstall.bat $(ISODIR)/add/; \
 	cp files/hdd.img.gz $(ISODIR)/add/; \
 	cp files/defvidalia.conf $(ISODIR)/add/; \
 	cp files/defpolipo.conf $(ISODIR)/add/; \

Modified: torvm/trunk/build/win32/files/buildall.sh
===================================================================
--- torvm/trunk/build/win32/files/buildall.sh	2009-03-16 13:05:33 UTC (rev 19048)
+++ torvm/trunk/build/win32/files/buildall.sh	2009-03-16 13:19:51 UTC (rev 19049)
@@ -1208,6 +1208,8 @@
   cp /src/$VIDALIA_DIR/pkg/win32/*.wxl ./
   cp ../torvm-w32/tor-icon-32.ico ./torvm.ico
   cp ../torvm-w32/tor-icon-32.ico ./tor.ico
+  cp /src/add/uninstall.bat ./Uninstall_Tor.bat
+  unix2dos ./Uninstall_Tor.bat
   # DONT STRIP PY2EXEs!
   cp $thandir/Thandy.exe bin/
   cp /src/$TOR_DIR/bin/*.exe bin/

Added: torvm/trunk/build/win32/files/uninstall.bat
===================================================================
--- torvm/trunk/build/win32/files/uninstall.bat	                        (rev 0)
+++ torvm/trunk/build/win32/files/uninstall.bat	2009-03-16 13:19:51 UTC (rev 19049)
@@ -0,0 +1,57 @@
+ at ECHO OFF
+IF EXIST "%USERPROFILE%\Local Settings\Application Data\Thandy\TorVM Updates" (
+  cd "%USERPROFILE%\Local Settings\Application Data\Thandy\TorVM Updates"
+  for %%f in (*.msi) do msiexec /x %%f /qn
+  for %%f in (*.msi) do del /F %%f
+  cd ..
+  rmdir "TorVM Updates"
+)
+IF EXIST "%USERPROFILE%\Local Settings\Application Data\Thandy\Tor Updates" (
+  cd "%USERPROFILE%\Local Settings\Application Data\Thandy\Tor Updates"
+  for %%f in (*.msi) do msiexec /x %%f /qn
+  for %%f in (*.msi) do del /F %%f
+  cd ..
+  rmdir "Tor Updates"
+)
+IF EXIST "%USERPROFILE%\Local Settings\Application Data\Thandy\Polipo Updates" (
+  cd "%USERPROFILE%\Local Settings\Application Data\Thandy\Polipo Updates"
+  for %%f in (*.msi) do msiexec /x %%f /qn
+  for %%f in (*.msi) do del /F %%f
+  cd ..
+  rmdir "Polipo Updates"
+)
+IF EXIST "%USERPROFILE%\Local Settings\Application Data\Thandy\TorButton Updates" (
+  cd "%USERPROFILE%\Local Settings\Application Data\Thandy\TorButton Updates"
+  for %%f in (*.msi) do msiexec /x %%f /qn
+  for %%f in (*.msi) do del /F %%f
+  cd ..
+  rmdir "TorButton Updates"
+)
+IF EXIST "%USERPROFILE%\Local Settings\Application Data\Thandy\Vidalia Updates" (
+  cd "%USERPROFILE%\Local Settings\Application Data\Thandy\Vidalia Updates"
+  for %%f in (*.msi) do msiexec /x %%f /qn
+  for %%f in (*.msi) do del /F %%f
+  cd ..
+  rmdir "Vidalia Updates"
+)
+IF EXIST "%USERPROFILE%\Local Settings\Application Data\Thandy\Vidalia Marble Updates" (
+  cd "%USERPROFILE%\Local Settings\Application Data\Thandy\Vidalia Marble Updates"
+  for %%f in (*.msi) do msiexec /x %%f /qn
+  for %%f in (*.msi) do del /F %%f
+  cd ..
+  rmdir "Vidalia Marble Updates"
+)
+IF EXIST %PROGRAMFILES%\TorInstPkgs (
+  cd %PROGRAMFILES%\TorInstPkgs
+  for %%f in (*.msi) do msiexec /x %%f /qn
+  for %%f in (*.msi) do del /F %%f
+  cd ..
+  rmdir TorInstPkgs
+)
+IF EXIST "%USERPROFILE%\Local Settings\Application Data\TorInstPkgs" (
+  cd "%USERPROFILE%\Local Settings\Application Data\TorInstPkgs"
+  for %%f in (*.msi) do msiexec /x %%f /qn
+  for %%f in (*.msi) do del /F %%f
+  cd ..
+  rmdir TorInstPkgs
+)

Modified: torvm/trunk/build/win32/src/pkg/bundle.nsi
===================================================================
--- torvm/trunk/build/win32/src/pkg/bundle.nsi	2009-03-16 13:05:33 UTC (rev 19048)
+++ torvm/trunk/build/win32/src/pkg/bundle.nsi	2009-03-16 13:19:51 UTC (rev 19049)
@@ -55,6 +55,8 @@
 	ExecWait 'msiexec /i "$INSTDIR\polipo.msi" NOSC=1 /qn'
 	ExecWait 'msiexec /i "$INSTDIR\torbutton.msi" /qn'
 	ExecWait 'msiexec /i "$INSTDIR\license.msi" NOSC=1 /qn'
+        SetOutPath $DESKTOP
+        File "Uninstall_Tor.bat"
 FunctionEnd
 
 Function LaunchTorVM

Modified: torvm/trunk/build/win32/src/pkg/netinst.nsi
===================================================================
--- torvm/trunk/build/win32/src/pkg/netinst.nsi	2009-03-16 13:05:33 UTC (rev 19048)
+++ torvm/trunk/build/win32/src/pkg/netinst.nsi	2009-03-16 13:19:51 UTC (rev 19049)
@@ -55,6 +55,8 @@
 	ExecWait '"$LOCALAPPDATA\Programs\Thandy\thandy.exe" update --install "--repo=$LOCALAPPDATA\Thandy\Polipo Updates" /bundleinfo/polipo/win32/'
 	ExecWait '"$LOCALAPPDATA\Programs\Thandy\thandy.exe" update --install "--repo=$LOCALAPPDATA\Thandy\TorButton Updates" /bundleinfo/torbutton/win32/'
 	ExecWait '"$LOCALAPPDATA\Programs\Thandy\thandy.exe" update --install "--repo=$LOCALAPPDATA\Thandy\Vidalia Updates" /bundleinfo/vidalia/win32/'
+        SetOutPath $DESKTOP
+        File "Uninstall_Tor.bat"
 FunctionEnd
 
 Function LaunchTorVM