Changeset 31463

Show
Ignore:
Timestamp:
06.03.2017 19:42:19 (3 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.

Files:
1 modified

Legend:

Unmodified
Added
Removed
  • main/trunk/greenstone3/gs3-setup.bat

    r31461 r31463  
    194194    echo *** Testing bitness of JAVA_HOME found at !FOUNDJAVAHOME!: 
    195195    "!FOUNDJAVAHOME!\bin\java.exe" -d%bitness% -version 2> nul 
    196     if !ERRORLEVEL! equ 1 echo *** The detected system JDK java is an incompatible bit architecture& goto testjre    
     196    if !ERRORLEVEL! equ 1 echo *** The detected JDK java is an incompatible bit architecture& goto testjre   
    197197    if !ERRORLEVEL! equ 0 ( 
    198         echo *** The detected system JDK java is a matching %bitness% bit        
     198        echo *** The detected JDK java is a matching %bitness% bit       
    199199        goto setupjavahome 
    200200    )    
     
    219219:: All but MG/MGPP and GDBM should still work with 64 bit java. 
    220220if exist "!HINT!\bin\java.exe" ( 
    221   echo *** Changing to use the GS bundled 32-bit jre. 
     221  echo *** Changing to use Greenstone's bundled 32-bit jre. 
    222222  set JRE_HOME=!HINT! 
    223223  set PATH=!JAVA_HOME!\bin;!PATH! 
     
    231231:setupjavahome 
    232232if DEFINED FOUNDJAVAHOME  ( 
    233     echo *** Using the system JAVA_HOME detected at !FOUNDJAVAHOME! 
     233    echo *** Using the JAVA_HOME detected at !FOUNDJAVAHOME! 
    234234    set JAVA_HOME=!FOUNDJAVAHOME! 
    235235    set PATH=!FOUNDJAVAHOME!\bin;!PATH! 
     
    248248 
    249249:: 5. Last ditch effort: search4j couldn't find any java, but check any Java env vars set anyway 
    250 echo *** Search4j could not find an appropriate JAVA or JRE. 
     250echo *** Search4j could not find an appropriate JDK or JRE java. 
    251251echo *** Attempting to use any JAVA_HOME else JRE_HOME in the environment... 
    252252