Changeset 23256 for main/trunk/release-kits/shared/core/uninstaller/Uninstall.bat

Timestamp:

2010-11-01T10:46:00+13:00 (13 years ago)

Author:

sjm84

Message:

More minor installer/uninstaller modifications

File:

• main/trunk/release-kits/shared/core/uninstaller/Uninstall.bat (modified) (1 diff)

main/trunk/release-kits/shared/core/uninstaller/Uninstall.bat

@@ -30 +30 @@
     if "%1" == "Elevated" shift
 
-if exist ..\bin\windows\search4j.exe ..\bin\windows\search4j.exe -p ..\packages\jre -l .\uninst.jar
+cd ..
+if exist .\bin\windows\search4j.exe .\bin\windows\search4j.exe -p .\packages\jre -l .\uninstall\uninst.jar
 
-if exist ..\gs2build\bin\windows\search4j.exe ..\gs2build\bin\windows\search4j.exe -p ..\packages\jre -l .\uninst.jar
-
+if exist .\gs2build\bin\windows\search4j.exe .\gs2build\bin\windows\search4j.exe -p .\packages\jre -l .\uninstall\uninst.jar
 
 if exist uninst.flag (
 
-    rd /s /q ..\packages\jre
-    rmdir ..\packages
+    rd /s /q packages\jre
+    rmdir packages
     
-    if exist ..\bin\windows\search4j.exe (
-        del ..\bin\windows\search4j.exe
-        rmdir ..\bin\windows
+    if exist bin\windows\search4j.exe (
+        del bin\windows\search4j.exe
+        rmdir bin\windows
     )
-    if exist ..\gs2build\bin\windows\search4j.exe (
-        del ..\gs2build\bin\windows\search4j.exe
-        rd /s /q ..\gs2build
+    if exist gs2build\bin\windows\search4j.exe (
+        del gs2build\bin\windows\search4j.exe
+        rd /s /q gs2build
     )
         
-    del uninst.jar
-    del uninst.flag
-    del Uninstall.*
-    del *.uninstall
-    rmdir /S /Q ..\bin
-    rmdir /S /Q ..\tmp
-    rmdir /S /Q ..\ext
+    del uninstall\uninst.jar
+    del uninstall\uninst.flag
+    del uninstall\Uninstall.*
+    del uninstall\*.uninstall
+    rmdir /S /Q bin
+    rmdir /S /Q tmp
+    rmdir /S /Q ext
     
-    cd ..
     set GSDEL=!CD!
-    cd ..
     
     echo @echo off > %TEMP%\gsuninstall.bat