Changeset 35314

Timestamp:

2021-08-20T23:08:32+12:00 (3 years ago)

Author:

davidb

Message:

Some refinement of the (echo) messages generated so the information presented in general doesn't sound quite so scary, when things are in fact still on track

Files:

• gs3-extensions/solr/trunk/src/gs3-setup.bat (modified) (2 diffs)
• main/trunk/greenstone3/gs3-setup.bat (modified) (1 diff)
• main/trunk/greenstone3/gs3-setup.sh (modified) (6 diffs)

gs3-extensions/solr/trunk/src/gs3-setup.bat

@@ -36 +36 @@
 :foundall
 endlocal& set SOLR_HOST=%SOLR_HOST%& set SOLR_PORT=%SOLR_PORT%
-echo Tomcat host: %SOLR_HOST%
-echo Tomcat port: %SOLR_PORT%
+echo   - Solr API accessed internally via: http://%SOLR_HOST%:%SOLR_PORT%/solr/
+rem echo Tomcat host: %SOLR_HOST%
+rem echo Tomcat port: %SOLR_PORT%
 
 
-rem IF USING JETTY SERVER FOR SOLR
-:: The port Jetty runs on:
-set SOLR_JETTY_PORT=8983
+rem rem IF USING JETTY SERVER FOR SOLR
+rem :: The port Jetty runs on:
+rem set SOLR_JETTY_PORT=8983
 
-:: The port Jetty listens on for a "stop" command
-set JETTY_STOP_PORT=8079
+rem :: The port Jetty listens on for a "stop" command
+rem set JETTY_STOP_PORT=8079
 
 if "%OS%" == "Windows_NT" goto WinNT
@@ -99 +100 @@
 :: variables with brackets in them, such as "Program Files (x86)"
 
-::echo ++Solr/Jetty server will run on port %SOLR_JETTY_PORT% (+ port %JETTY_STOP_PORT% for shutdown command)
-echo ++Solr will run off the tomcat server on port %SOLR_PORT%
-echo --This port value can be changed by editing tomcat.port in build.properties
-::echo --  %0
+rem ::echo ++Solr/Jetty server will run on port %SOLR_JETTY_PORT% (+ port %JETTY_STOP_PORT% for shutdown command)
+rem echo ++Solr will run off the tomcat server on port %SOLR_PORT%
+rem echo --This port value can be changed by editing tomcat.port in build.properties
+rem ::echo --  %0
 
 

main/trunk/greenstone3/gs3-setup.bat

@@ -180 +180 @@
 if "%bitness%" == "PE32+" (
     set bitness=64
-    echo The installed Greenstone is 64 bit
+rem echo The installed Greenstone is 64 bit
 ) else (
     if "%bitness%" == "PE32" (
         set bitness=32
-        echo The installed Greenstone is 32 bit
+rem     echo The installed Greenstone is 32 bit
     ) else (
-        echo WARNING: Greenstone installation is of unknown bitness. "%bitness%" is neither 32 nor 64 bit
+        echo WARNING: Greenstone installation is of unknown bitness. "%bitness%" is neither '32-bit' nor '64-bit'
         set bitness=UNKNOWN
     )
 )
 
+echo JNI bitness test: %bitness%
+      
 :: 2. What bitness are any JAVA_HOME else JRE_HOME found by search4j?
 :: If you run the non-existent program "pinky" from batch or the DOS console, the exit value is 9009

main/trunk/greenstone3/gs3-setup.sh

@@ -239 +239 @@
   elif [ ! -f "$TESTFILE" ]; then
       # the file we want to test the bitness of, to determine GS3's bitness by, doesn't exist yet
-      echo "    $TESTFILE is not found, unable to determine bitness of this Greenstone3"
+#      echo "    $TESTFILE is not found, unable to determine bitness of this Greenstone3"
+      echo "  - No JNI files detected.  Skipping Java bitness test"
       bitness=-1
   else
@@ -245 +246 @@
       if [[ $bitness = *"64-bit"* ]]; then
       bitness=64
-      echo "The installed Greenstone is $bitness bit"
+#     echo "The installed Greenstone is $bitness bit"
       elif [[ $bitness = *"32-bit"* ]]; then
       bitness=32
-      echo "The installed Greenstone is $bitness bit"
+#     echo "The installed Greenstone is $bitness bit"
       else
       bitness=-1
-      echo "WARNING: Greenstone installation is of unknown bitness. \"$bitness\" is neither 32 nor 64 bit"
-      fi
-  fi
- echo bitness = $bitness
+      echo "WARNING: Greenstone installation is of unknown bitness. \"$bitness\" is neither '32-bit' nor '64-bit'"
+      fi
+      echo "JNI bitness test: $bitness"
+  fi
 
   # If search4j is present, use it to locate a java.
@@ -262 +263 @@
   # we'll print a warning about this bitness mismatch at the end
 
+  echo ""
+  echo "Checking for Java"
+  
   javaset=false
   if [ -x bin/search4j ] ; then
@@ -323 +327 @@
       #echo "*** Could not find an appropriate JDK or JRE java"
       #echo "*** Attempting to use JAVA_HOME else JRE_HOME in the environment"
-      echo "Checking for Java explicitly set through environment variables"
+      echo "  - search4j' not detected.  Checking for Java explicitly set through environment variables"
       if [ "$JAVA_HOME" != "" ] && [ "`which java`" = "$JAVA_HOME/bin/java" ]; then
       echo "  - Using Java at $JAVA_HOME"
-      echo "  - Detected Java version: `$JAVA_HOME/bin/java -version 2>&1 | head -n 1`"
-      echo "  - Note that Greenstone requires Java 1.5 or greater"
-#     echo "  - WARNING: Greenstone has not checked the version number of this java installation"
-#     echo "             The source distribution of Greenstone3 requires java 1.5 or greater"
-#     echo "             (SVN users may still use java 1.4)"
+      if [ "$DEBUG" = "true" ] ; then
+          echo "  - Detected Java version: `$JAVA_HOME/bin/java -version 2>&1 | head -n 1`"
+          echo "  - Note that Greenstone requires Java 1.5 or greater"
+#         echo "  - WARNING: Greenstone has not checked the version number of this java installation"
+#             echo "             The source distribution of Greenstone3 requires java 1.5 or greater"
+          #       echo "             (SVN users may still use java 1.4)"
+      fi
       elif [ "$JRE_HOME" != "" ] && [ "`which java`" = "$JRE_HOME/bin/java" ]; then
       echo "  - Using java at $JRE_HOME"
-      echo "  - Detected Java version: `$JAVA_HOME/bin/java -version 2>&1 | head -n 1`"
-      echo "  - Note that Greenstone requires Java 1.5 or greater"    
-#     echo "  - WARNING: Greenstone has not checked the version number of this java installation"
-#     echo "             The source distribution of Greenstone3 requires java 1.5 or greater"
-#     echo "             (SVN users may still use java 1.4)"
-      
+      if [ "$DEBUG" = "true" ] ; then
+          echo "  - Detected Java version: `$JAVA_HOME/bin/java -version 2>&1 | head -n 1`"
+          echo "  - Note that Greenstone requires Java 1.5 or greater"    
+#         echo "  - WARNING: Greenstone has not checked the version number of this java installation"
+#         echo "             The source distribution of Greenstone3 requires java 1.5 or greater"
+#         echo "             (SVN users may still use java 1.4)"
+      fi
       #failing all that, print a warning
       else
-          #no suitable java exists
-      echo "  - ERROR: Failed to locate java"
-      echo "           Please set JAVA_HOME or JRE_HOME to point to an appropriate java"
-      echo "           And add JAVA_HOME/bin or JRE_HOME/bin to your PATH"
-      return
+      echo "  - Did not detect 'java' via JAVA_HOME or JRE_HOME"
+      echo "Testing for 'java' on PATH"
+      command -v java
+      if [ $? != 0 ] ; then
+              #no suitable java exists
+          echo "  - Error: Failed to locate 'java'"
+          echo "           Please set JAVA_HOME or JRE_HOME to point to an appropriate java"
+          echo "           And add JAVA_HOME/bin or JRE_HOME/bin to your PATH"
+          return
+      fi
       fi
     fi
@@ -522 +534 @@
 setGS3ENV
 
-echo "done"
-
 if test -e gs2build/setup.bash ; then 
   echo ""
@@ -586 +596 @@
 fi
 
+echo "done"
+