Changeset 31463 for main

Timestamp:

2017-03-06T19:42:19+13:00 (7 years ago)

Author:

ak19

Message:

Improving error messages, which also brings the windows gs3-setup script in line with the changes just committed for the linux script.

File:

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

main/trunk/greenstone3/gs3-setup.bat

@@ -194 +194 @@
     echo *** Testing bitness of JAVA_HOME found at !FOUNDJAVAHOME!:
     "!FOUNDJAVAHOME!\bin\java.exe" -d%bitness% -version 2> nul
-    if !ERRORLEVEL! equ 1 echo *** The detected system JDK java is an incompatible bit architecture& goto testjre   
+    if !ERRORLEVEL! equ 1 echo *** The detected JDK java is an incompatible bit architecture& goto testjre  
     if !ERRORLEVEL! equ 0 (
-        echo *** The detected system JDK java is a matching %bitness% bit       
+        echo *** The detected JDK java is a matching %bitness% bit      
         goto setupjavahome
     )   
@@ -219 +219 @@
 :: All but MG/MGPP and GDBM should still work with 64 bit java.
 if exist "!HINT!\bin\java.exe" (
-  echo *** Changing to use the GS bundled 32-bit jre.
+  echo *** Changing to use Greenstone's bundled 32-bit jre.
   set JRE_HOME=!HINT!
   set PATH=!JAVA_HOME!\bin;!PATH!
@@ -231 +231 @@
 :setupjavahome
 if DEFINED FOUNDJAVAHOME  (
-    echo *** Using the system JAVA_HOME detected at !FOUNDJAVAHOME!
+    echo *** Using the JAVA_HOME detected at !FOUNDJAVAHOME!
     set JAVA_HOME=!FOUNDJAVAHOME!
     set PATH=!FOUNDJAVAHOME!\bin;!PATH!
@@ -248 +248 @@
 
 :: 5. Last ditch effort: search4j couldn't find any java, but check any Java env vars set anyway
-echo *** Search4j could not find an appropriate JAVA or JRE.
+echo *** Search4j could not find an appropriate JDK or JRE java.
 echo *** Attempting to use any JAVA_HOME else JRE_HOME in the environment...