Changeset 17730

Timestamp:

2008-11-06T12:13:07+13:00 (15 years ago)

Author:

max

Message:

Fixed some bugs for the Uninstaller on all platforms.

Location:

release-kits/shared/uninstaller

Files:

• Uninstall.bat (modified) (1 diff)
• Uninstall.sh (modified) (3 diffs)

release-kits/shared/uninstaller/Uninstall.bat

@@ -1 +1 @@
 @echo off
-setup.bat > NUL
-.\bin\%GSDLOS%\search4j.exe -p .\packages\jre -l .\uninst.jar
+if exist setup.bat setup.bat > NUL
+if exist gs2build\setup.bat gs2build\setup.bat > NUL
+
+%GSDLHOME%\bin\%GSDLOS%\search4j.exe -p .\packages\jre -l .\uninst.jar
 
 if exist uninst.flag (

release-kits/shared/uninstaller/Uninstall.sh

@@ +1 @@
+if [ -f "setup.bash" ]; then
 . ./setup.bash > /dev/null
-./bin/$GSDLOS/search4j -p ./packages/jre -l ./uninst.jar
+else
+. ./gs2build/setup.bash > /dev/null
+fi
+
+$GSDLHOME/bin/$GSDLOS/search4j -p ./packages/jre -l ./uninst.jar
 
 if [ -e "uninst.flag" ]; then
@@ -7 +12 @@
     rmdir packages
     
-    rm bin/search4j
+    rm -f bin/search4j
     rmdir bin
         
@@ -15 +20 @@
     
     CONTENTS=`ls`
-    if [ "$CONTENTS" == "" ]; then
+    if [ -z "$CONTENTS" ]; then
         GSDEL=`pwd`
         cd ..
         rmdir $GSDEL
     fi
-    
 fi