Changeset 36583 for main/trunk/greenstone3/gs3-setup.sh

Timestamp:

2022-09-06T17:35:33+12:00 (20 months ago)

Author:

davidb

Message:

Need a more carefully constructed way of starting Tomcat with _RUNJAVA specifying xvfb-run-java (when required), but also stopping Tomcat with a regular java (i.e., not the xvfb-run-java version. Solution take is to have gs3-setup.sh set an enviroment variable for this, when bash-script confirms xvfb-run-java is needed

File:

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

main/trunk/greenstone3/gs3-setup.sh

@@ -576 +576 @@
 # work out if the system is capable of running webswing
 #
-# => If a headless server, then needs 'xvfb-run' 
+# => If it can, but is a headless server, then needs 'xvfb-run' 
+
+export CATALINA_START_RUNJAVA=""
 
 if [ -f packages/tomcat/webapps/webswing-server.war ] ; then
@@ -582 +584 @@
     if [ "$GSDLOS" = "linux" ] && [ "x$DISPLAY" = "x" ] ; then
     # a headless linux server
-    # => need xvfb-run to be able to operate webswing-server.jar
+    # => need xvfb-run to be able to operate webswing-server.war
     
     command -v xvfb-run > /dev/null 2>&1
     if [ $? = 0 ] ; then
-        echo "Setting _RUNJAVA to 'xvfb-run-java'"
+        echo "Setting CATALINA_START_RUNJAVA to '$GSDL3SRCHOME/bin/script/xvfb-run-java'"
         echo "  => Allows webswing-server.war to graphically render on headless server"
-        export _JAVARUN="xvfb-run-java"
+        export CATALINA_START_RUNJAVA="$GSDL3SRCHOME/bin/script/xvfb-run-java"
     else
         echo "Warning: No DISPLAY variable set     => looks like a headless server"
-        echo "         Unable to detect 'xvfb-run' => webswing-server.war will not function"
+        echo "         Unable to detect 'xvfb-run' => webswing-server.war unlikely to work"
     fi
     echo ""
     fi
 fi
+
 
 # Ant