Changeset 36543

Timestamp:

2022-09-01T17:51:24+12:00 (20 months ago)

Author:

davidb

Message:

Additional check added in to help Linux machines operate with webswing-server.war

File:

• main/trunk/greenstone3/gs3-setup.sh (modified) (1 diff)

main/trunk/greenstone3/gs3-setup.sh

@@ -571 +571 @@
 checkJava
 echo ""
+
+
+# If webswing-server.war is present, then (for X-Window systems)
+# work out if the system is capable of running webswing
+#
+# => If a headless server, then needs 'xvfb-run' 
+
+if [ -f packages/tomcat/webapps/webswing-server.war ] ; then
+
+    if [ "$GSDLOS" = "linux" ] && [ "x$DISPLAY" = "x" ] ; then
+    # a headless linux server
+    # => need xvfb-run to be able to operate webswing-server.jar
+    
+    command -v xvfb-run > /dev/null 2>&1
+    if [ $? = 0 ] ; then
+        echo "Setting _RUNJAVA to 'xvfb-run-java'"
+        echo "  => Allows webswing-server.war to graphically render on headless server"
+        export _JAVARUN="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"
+    fi
+    echo ""
+    fi
+fi
 
 # Ant