# HG changeset patch # User HackBot # Date 1360975014 0 # Node ID aa25f94ba00cf853f8862010c6e9a5a0ca941834 # Parent 44647bca60bcfebd67ee32d3b986eb72b8f88b8f cp $(which js) bin/js diff -r 44647bca60bc -r aa25f94ba00c bin/js --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/bin/js Sat Feb 16 00:36:54 2013 +0000 @@ -0,0 +1,22 @@ +#!/bin/sh + +JAVA_CMD="/usr/bin/java" +JAVA_OPTS="" +JAVA_CLASSPATH="/usr/share/java/js.jar:/usr/share/java/jline.jar" +JAVA_MAIN="org.mozilla.javascript.tools.shell.Main" + +## Fix for #512498 +## Change Bootclasspath when using OpenJDK because OpenJDK6 +## bundle his own release of Rhino. +## References: +## +## +## +isOpenJDK=`$JAVA_CMD -version 2>&1 | grep -i "OpenJDK" | wc -l` +if [ $isOpenJDK -gt 0 ] +then + JAVA_OPTS="-Xbootclasspath:/usr/lib/jvm/java-6-openjdk/jre/lib/rt.jar" +fi + + +$JAVA_CMD $JAVA_OPTS -classpath $JAVA_CLASSPATH $JAVA_MAIN $@