Changeset 22526

Show
Ignore:
Timestamp:
30.07.2010 12:29:58 (9 years ago)
Author:
sjm84
Message:

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

Files:
1 modified

Legend:

Unmodified
Added
Removed
  • main/trunk/gli/gli.bat

    r22525 r22526  
    1010 
    1111:: This script must be run from within the directory in which it lives 
    12 if exist gli.bat goto checkUserPermissions 
     12if exist gli.bat goto start 
    1313    if "%GLILANG%" == "en" echo This script must be run from the directory in which it resides. 
    1414    if "%GLILANG%" == "es" echo Este gui¢n deber  ejecutarse desde el directorio en el que reside. 
     
    1717    if "%GLILANG%" == "ru" echo â®â áªàš¯â €®«Š¥­ ¡ëâì ¢§ïâ š§ €šà¥ªâ®àšš, ¢ ª®â®à®© ®­ à á¯®«®Š¥­ 
    1818    goto exit 
    19  
    20 :checkUserPermissions 
    21 echo Checking if GSDLHOME is writable... 
    22 echo This is a temporary file. It is safe to delete it. > "%GSDLHOME%\collect\testing.tmp" 
    23 if exist "%GSDLHOME%\collect\testing.tmp" goto deleteTempFile 
    24     if "%1" == "Elevated" goto start 
    25     "%GSDLHOME%\bin\windows\gstart.exe" %0 Elevated %1 %2 %3 %4 %5 %6 %7 %8 %9 
    26     goto done 
    27      
    28 :deleteTempFile 
    29 del "%GSDLHOME%\collect\testing.tmp" 
    3019     
    3120:start 
     
    5544if "%GSDLHOME%" == "" goto exit 
    5645 
     46:checkUserPermissions 
     47echo Checking if the collection directory is writable... 
     48echo This is a temporary file. It is safe to delete it. > "%GSDLHOME%\collect\testing.tmp" 
     49if exist "%GSDLHOME%\collect\testing.tmp" goto deleteTempFile 
     50    if "%1" == "Elevated" goto findPerl 
     51    if "%2" == "Elevated" goto findPerl 
     52    "%GSDLHOME%\bin\windows\gstart.exe" %0 %1 Elevated %2 %3 %4 %5 %6 %7 %8 %9 
     53    goto done 
     54     
     55:deleteTempFile 
     56del "%GSDLHOME%\collect\testing.tmp" 
     57 
     58:findPerl 
    5759:: Now need to find Perl. If found, PERLPATH will be set 
    5860call findperl.bat