Changeset 31471

Timestamp:

2017-03-07T19:32:33+13:00 (7 years ago)

Author:

ak19

Message:

Removed dangerous trailing whitespace when setting environment variable

File:

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

main/trunk/greenstone3/gs3-setup.bat

@@ -168 +168 @@
 :: http://stackoverflow.com/questions/6474738/batch-file-for-f-doesnt-work-if-path-has-spaces
 :: Could use shortfilenames, see http://stackoverflow.com/questions/10227144/convert-long-filename-to-short-filename-8-3-using-cmd-exe
-for /f "usebackq tokens=2 delims= " %%G IN (`call "%GSDLHOME%\bin\windows\GNUfile\bin\file.exe" "%GSDL3SRCHOME%\bin\search4j.exe"`) do set bitness=%%G
+if not exist "!GSDL3SRCHOME!\lib\jni\gdbmjava.dll" set bitness=UNKNOWN& goto testjavahome
+for /f "usebackq tokens=2 delims= " %%G IN (`call "!GSDLHOME!\bin\windows\GNUfile\bin\file.exe" "!GSDL3SRCHOME!\lib\jni\gdbmjava.dll"`) do set bitness=%%G
 
 if "%bitness%" == "PE32+" (
@@ -198 +199 @@
     if !ERRORLEVEL! equ 1 echo *** The detected JDK java is incompatible with !bitness! bit GS& goto testjre    
     if !ERRORLEVEL! equ 0 (
-        echo *** The detected JDK java is a matching %bitness% bit      
+        echo *** The detected JDK java is a matching %bitness% bit
         goto setupjavahome
     )   
@@ -209 +210 @@
     "!FOUNDJREHOME!\bin\java.exe" -d%bitness% -version 2> nul
     if !ERRORLEVEL! equ 1 echo *** The detected JRE java is incompatible with !bitness! bit GS& goto testbundledjre
-    if !ERRORLEVEL! equ 0 ( 
+    if !ERRORLEVEL! equ 0 (
         rem The JRE_HOME found by search4j may be the bundled JRE, overriding any system JRE_HOME,
-        rem because the bundled JRE_HOME was provided as HINT to search4j.      
-        echo *** The detected JRE java is a matching %bitness% bit          
+        rem because the bundled JRE_HOME was provided as HINT to search4j.
+        echo *** The detected JRE java is a matching %bitness% bit
         goto setupjrehome
     )   
@@ -225 +226 @@
     "!BUNDLED_JRE!\bin\java.exe" -d%bitness% -version 2> nul
     if !ERRORLEVEL! equ 1 echo *** The detected JRE java is incompatible with !bitness! bit& goto setupjavahome
-    if !ERRORLEVEL! equ 0 ( 
-        echo *** The detected JRE java is a matching %bitness% bit          
+    if !ERRORLEVEL! equ 0 (
+        echo *** The detected JRE java is a matching %bitness% bit
         goto bundledjre
     )
@@ -249 +250 @@
 if DEFINED FOUNDJAVAHOME  (
     echo *** Using the JAVA_HOME detected at !FOUNDJAVAHOME!
-    set JAVA_HOME=!FOUNDJAVAHOME!   
+    set JAVA_HOME=!FOUNDJAVAHOME!
     set PATH=!FOUNDJAVAHOME!\bin;!PATH!
     set RUNJAVA=!FOUNDJAVAHOME!\bin\java.exe