Changeset 22573 for main/trunk/release-kits/shared/core

Timestamp:

2010-08-05T09:49:08+12:00 (14 years ago)

Author:

sjm84

Message:

Updated the messages printed by the uninstaller if extra permissions are required

File:

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

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

@@ -3 +3 @@
 
 :checkUserPermissions
-echo Checking if the collection directory is writable...
-echo This is a temporary file. It is safe to delete it. > testing.tmp 2>nul
-if exist testing.tmp goto deleteTempFile 
-    if "%1" == "Elevated" goto shiftElevated
-    bin\windows\gstart.exe %0 Elevated %1 %2 %3 %4 %5 %6 %7 %8 %9
+    echo Checking if the Greenstone directory is writable ...
+    (echo This is a temporary file. It is safe to delete it. > "%GSDLHOME%\testing.tmp" ) 2>nul
+    if exist "%GSDLHOME%\testing.tmp" goto deleteTempFile 
+    if "%1" == "Elevated" goto printWarning
+    echo ... FAILED
+    echo The uninstaller cannot write to the Greenstone directory (%GSDLHOME%)
+    echo Requesting elevated status to become admin user to continue.
+    "%GSDLHOME%\bin\windows\gstart.exe" %0 Elevated %1 %2 %3 %4 %5 %6 %7 %8 %9
     goto done
+    
+:printWarning
+    echo ... FAILED
+    echo The uninstaller cannot write to the Greenstone directory (%GSDLHOME%). 
+    echo Attempting to continue without permissions.
+    goto shiftElevated
 
 :deleteTempFile
-del testing.tmp
+    echo ... OK
+    del "%GSDLHOME%\testing.tmp"
 
 :shiftElevated
 :: Shift "Elevated" (one of our own internal command words) out of the way if present
 :: so the command-line is as it was when the user initiated the command
-if "%1" == "Elevated" shift
+    if "%1" == "Elevated" shift
 
 if exist .\bin\windows\search4j.exe .\bin\windows\search4j.exe -p .\packages\jre -l .\uninst.jar