Changeset 16470

Timestamp:

2008-07-18T15:59:53+12:00 (15 years ago)

Author:

ak19

Message:

FEDORA_VERSION has become the secondary environment variable when running FLI. It has replaced FEDORA2_HOME/FEDORA3_HOME. When running this script, if FEDORA_HOME is set but FEDORA_VERSION isn't, then FEDORA_VERSION will default to 3 along with warning that this has been done.

File:

• gli/trunk/fli.bat (modified) (1 diff)

gli/trunk/fli.bat

@@ -12 +12 @@
 
 
-:: Test to see if FEDORA2 environment variables have been set up
-if "%FEDORA2_HOME%" == "" goto chkFed3
-    :: Else FEDORA2_HOME exists testing if the directory FEDORA2_HOME exists
+echo.
+:: Test to see if FEDORA_HOME environment variable has been set up
+if "%FEDORA_HOME%" == "" goto noFed
+    :: Check if the directory FEDORA_HOME exists
     :: MAN: Can't use the if command to test directly for a directory, but the null (NUL) device does exist in
     :: every directory. As a result, you can test for the null device to determine whether a directory exists. 
-    if not exist %FEDORA2_HOME%\nul echo Error: Cannot find Fedora-2 home: No such directory %FEDORA2_HOME%
-    if not exist %FEDORA2_HOME%\nul goto exit
+    if not exist %FEDORA_HOME%\nul echo Error: Cannot find Fedora home. No such directory: %FEDORA_HOME%
+    if not exist %FEDORA_HOME%\nul goto exit
+        
+:: If FEDORA_VERSION not set, default fedora-version to 3 after warning user.
+if not "%FEDORA_VERSION%" == "" goto runFed
+    echo FEDORA_VERSION (major version of Fedora) was not set. Defaulting to: 3.
+    echo If you are running a different version of Fedora, set the FEDORA_VERSION
+    echo environment variable.
+    set FEDORA_VERSION="3"
+    echo.
 
-        :: Otherwise FEDORA2_HOME exists and refers to a directory
-        set FEDORA_HOME=%FEDORA2_HOME%
-        :: MAN: The %* batch parameter is a wildcard reference to all the arguments, not including %0, 
-        :: that are passed to the batch file.
-        gli.bat -fedora_home %FEDORA2_HOME% %*
-            
-    
 
-:: Test to see if FEDORA3 environment variables have been set up
-:chkFed3
-if "%FEDORA3_HOME%" == "" echo Error: Cannot find Fedora-3 home or Fedora-2 home.  
-if "%FEDORA3_HOME%" == "" echo Have you set the environment variable 'FEDORA3_HOME' or 'FEDORA2_HOME'?
-if "%FEDORA3_HOME%" == "" goto exit
+:runFed
+:: MAN: The %* batch parameter is a wildcard reference to all the arguments, not including %0, 
+:: that are passed to the batch file.
+echo FEDORA_HOME: %FEDORA_HOME%. 
+echo FEDORA_VERSION: %FEDORA_VERSION%
+gli.bat -fedora -fedora_home %FEDORA_HOME% -fedora_version %FEDORA_VERSION% %*
 
-    :: Otherwise, FEDORA3_HOME has been set, check if it's a directory:
-    if not exist %FEDORA3_HOME%\nul echo Error: Cannot find Fedora-3 home: No such directory %FEDORA3_HOME%
-    if not exist %FEDORA3_HOME%\nul goto exit
-
-    :: Otherwise FEDORA2_HOME exists and refers to a directory
-    set FEDORA_HOME=%FEDORA3_HOME%
-    gli.bat -fedora -fedora_home %FEDORA3_HOME% %*
+:: Either (or both) of FEDORA_HOME and FEDORA_VERSION were not set, both are crucial
+:noFed
+echo Error: Cannot run %PROGNAME_EN% (%PROGABBR%) if FEDORA_HOME is not set.
+goto exit