Changeset 21988 for main/trunk/greenstone3

Timestamp:

2010-04-29T11:59:42+12:00 (14 years ago)

Author:

ak19

Message:

Updating gs3-setup.bat to handle JAVA_HOME and PATH having brackets

File:

• main/trunk/greenstone3/gs3-setup.bat (modified) (2 diffs)

main/trunk/greenstone3/gs3-setup.bat

@@ -1 +1 @@
 @echo off
+
+setlocal enabledelayedexpansion
 
 set java_min_version=1.5.0_00
@@ -92 +94 @@
 )
 
-if not "%FOUNDJAVAHOME%"=="" (
-  set JAVA_HOME=%FOUNDJAVAHOME%
-  set PATH=%FOUNDJAVAHOME%\bin;%PATH%
-  set RUNJAVA=%FOUNDJAVAHOME%\bin\java.exe
+if DEFINED FOUNDJAVAHOME  (
+  set JAVA_HOME=!FOUNDJAVAHOME!
+  set PATH=!FOUNDJAVAHOME!\bin;!PATH!
+  set RUNJAVA=!FOUNDJAVAHOME!\bin\java.exe
   goto summaryThenEnd
 )
 
-if not "%FOUNDJREHOME%"=="" (
-  set JRE_HOME=%FOUNDJREHOME%
-  set PATH=%FOUNDJREHOME%\bin;%PATH%
-  set RUNJAVA=%FOUNDJREHOME%\bin\java.exe
+if DEFINED FOUNDJREHOME (
+  set JRE_HOME=!FOUNDJREHOME!
+  set PATH=!FOUNDJREHOME!\bin;!PATH!
+  set RUNJAVA=!FOUNDJREHOME!\bin\java.exe
   goto summaryThenEnd
 )