Changeset 36583 for main/trunk
- Timestamp:
- 2022-09-06T17:35:33+12:00 (20 months ago)
- Location:
- main/trunk/greenstone3
- Files:
-
- 3 edited
Legend:
- Unmodified
- Added
- Removed
-
main/trunk/greenstone3/bin/script/xvfb-run-java
r36541 r36583 1 1 #!/bin/bash 2 2 3 xvfb-run java $*3 xvfb-run java "$@" 4 4 -
main/trunk/greenstone3/build.xml
r36573 r36583 2768 2768 <env key="WNHOME" path="${wn.home}"/> 2769 2769 <env key="FEDORA_HOME" path="${fedora.home}"/> 2770 2771 <env key="_RUNJAVA" value="${env.CATALINA_START_RUNJAVA}"/> 2770 2772 <arg value="${catalina.home}/bin/startup.sh"/> 2771 2773 </exec> -
main/trunk/greenstone3/gs3-setup.sh
r36543 r36583 576 576 # work out if the system is capable of running webswing 577 577 # 578 # => If a headless server, then needs 'xvfb-run' 578 # => If it can, but is a headless server, then needs 'xvfb-run' 579 580 export CATALINA_START_RUNJAVA="" 579 581 580 582 if [ -f packages/tomcat/webapps/webswing-server.war ] ; then … … 582 584 if [ "$GSDLOS" = "linux" ] && [ "x$DISPLAY" = "x" ] ; then 583 585 # a headless linux server 584 # => need xvfb-run to be able to operate webswing-server. jar586 # => need xvfb-run to be able to operate webswing-server.war 585 587 586 588 command -v xvfb-run > /dev/null 2>&1 587 589 if [ $? = 0 ] ; then 588 echo "Setting _RUNJAVA to 'xvfb-run-java'"590 echo "Setting CATALINA_START_RUNJAVA to '$GSDL3SRCHOME/bin/script/xvfb-run-java'" 589 591 echo " => Allows webswing-server.war to graphically render on headless server" 590 export _JAVARUN="xvfb-run-java"592 export CATALINA_START_RUNJAVA="$GSDL3SRCHOME/bin/script/xvfb-run-java" 591 593 else 592 594 echo "Warning: No DISPLAY variable set => looks like a headless server" 593 echo " Unable to detect 'xvfb-run' => webswing-server.war will not function"595 echo " Unable to detect 'xvfb-run' => webswing-server.war unlikely to work" 594 596 fi 595 597 echo "" 596 598 fi 597 599 fi 600 598 601 599 602 # Ant
Note:
See TracChangeset
for help on using the changeset viewer.