Permalink
Browse files

Make sure rhino runs in headless mode.

This fixes a problem we had with cappuccino's nib2cib failing on
our headless build server.

Note that I haven't uppdated the windows .cmd script. Maybe needed
there as well.
  • Loading branch information...
1 parent dd4decf commit 760773e0f0cffa74f50646986a7897aa7d7256d1 @tancred tancred committed Apr 27, 2012
Showing with 3 additions and 3 deletions.
  1. +3 −3 engines/rhino/bin/narwhal-rhino
View
6 engines/rhino/bin/narwhal-rhino
@@ -22,7 +22,7 @@ fi
CLASSPATH=$NARWHAL_ENGINE_HOME/jars/jna.jar
BOOTCLASSPATH=$NARWHAL_ENGINE_HOME/jars/js.jar
-JAVA_OPTS="-Dnarwhal.http_proxy=$http_proxy"
+JAVA_OPTS="-Dnarwhal.http_proxy=$http_proxy -Djava.awt.headless=true"
if [ -n "$NARWHAL_CLASSPATH" ]; then
CLASSPATH=$NARWHAL_CLASSPATH:$CLASSPATH
@@ -64,8 +64,8 @@ if [ $# -lt 1 ]; then
RLWRAP=""
CLASSPATH="$CLASSPATH:$NARWHAL_ENGINE_HOME/jars/jline.jar"
fi
- $RLWRAP java $JAVA_OPTS $NARWHAL_JAVA_ARGUMENTS -cp "$BOOTCLASSPATH:$CLASSPATH" "$JAVA_MAIN" -f "$BOOTSTRAP" -f -
+ exec $RLWRAP java $JAVA_OPTS $NARWHAL_JAVA_ARGUMENTS -cp "$BOOTCLASSPATH:$CLASSPATH" "$JAVA_MAIN" -f "$BOOTSTRAP" -f -
else
- java $JAVA_OPTS $NARWHAL_JAVA_ARGUMENTS -cp "$BOOTCLASSPATH:$CLASSPATH" "$JAVA_MAIN" -version "$NARWHAL_JS_VERSION" "$BOOTSTRAP" "$0" "$@"
+ exec java $JAVA_OPTS $NARWHAL_JAVA_ARGUMENTS -cp "$BOOTCLASSPATH:$CLASSPATH" "$JAVA_MAIN" -version "$NARWHAL_JS_VERSION" "$BOOTSTRAP" "$0" "$@"
fi

0 comments on commit 760773e

Please sign in to comment.