Changeset 22526

Timestamp:

2010-07-30T12:29:58+12:00 (14 years ago)

Author:

sjm84

Message:

Rellocated the elevation code so that it is after the search for GSDLHOME

File:

• main/trunk/gli/gli.bat (modified) (3 diffs)

main/trunk/gli/gli.bat

@@ -10 +10 @@
 
 :: This script must be run from within the directory in which it lives
-if exist gli.bat goto checkUserPermissions
+if exist gli.bat goto start
     if "%GLILANG%" == "en" echo This script must be run from the directory in which it resides.
     if "%GLILANG%" == "es" echo Este gui¢n deber  ejecutarse desde el directorio en el que reside.
@@ -17 +17 @@
     if "%GLILANG%" == "ru" echo â®â áªàš¯â €®«Š¥­ ¡ëâì ¢§ïâ š§ €šà¥ªâ®àšš, ¢ ª®â®à®© ®­ à ᯮ«®Š¥­
     goto exit
-
-:checkUserPermissions
-echo Checking if GSDLHOME is writable...
-echo This is a temporary file. It is safe to delete it. > "%GSDLHOME%\collect\testing.tmp"
-if exist "%GSDLHOME%\collect\testing.tmp" goto deleteTempFile
-    if "%1" == "Elevated" goto start
-    "%GSDLHOME%\bin\windows\gstart.exe" %0 Elevated %1 %2 %3 %4 %5 %6 %7 %8 %9
-    goto done
-    
-:deleteTempFile
-del "%GSDLHOME%\collect\testing.tmp"
     
 :start
@@ -55 +44 @@
 if "%GSDLHOME%" == "" goto exit
 
+:checkUserPermissions
+echo Checking if the collection directory is writable...
+echo This is a temporary file. It is safe to delete it. > "%GSDLHOME%\collect\testing.tmp"
+if exist "%GSDLHOME%\collect\testing.tmp" goto deleteTempFile
+    if "%1" == "Elevated" goto findPerl
+    if "%2" == "Elevated" goto findPerl
+    "%GSDLHOME%\bin\windows\gstart.exe" %0 %1 Elevated %2 %3 %4 %5 %6 %7 %8 %9
+    goto done
+    
+:deleteTempFile
+del "%GSDLHOME%\collect\testing.tmp"
+
+:findPerl
 :: Now need to find Perl. If found, PERLPATH will be set
 call findperl.bat