Changeset 22530 for main/trunk/gli

Timestamp:

2010-07-30T16:15:57+12:00 (14 years ago)

Author:

sjm84

Message:

Using shift to remove the extra arguments that we add to prevent infinite loops

File:

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

main/trunk/gli/gli.bat

@@ -22 +22 @@
     :: Invoke a new command processor to ensure there's enough environment space
     if "%1" == "Second" goto progName
-        command /E:2048 /C %0 Second %1 %2 %3 %4 %5 %6 %7 %8 %9
-        goto done
-
+        command /E:2048 /C %0 Second %1 %2 %3 %4 %5 %6 %7 %8 %9
+        shift
+        goto done
 
 :progName
@@ -46 +46 @@
 :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
+echo This is a temporary file. It is safe to delete it. > "%GSDLHOME%\collect\testing.tmp" 2>nul
+if exist "%GSDLHOME%\collect\testing.tmp" goto deleteTempFile 
+    if "%1" == "Elevated" goto shiftElevated
+    "%GSDLHOME%\bin\windows\gstart.exe" %0 Elevated %1 %2 %3 %4 %5 %6 %7 %8 %9
     goto done
-    
+
 :deleteTempFile
 del "%GSDLHOME%\collect\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
+
 :findPerl
-:: Now need to find Perl. If found, PERLPATH will be set
+:: Now need to find Perl. If found, PERLPATH will be set 
 call findperl.bat
 if "%PERLPATH%" == "" goto exit