From 76ec9384fb112ee528c5198af0261182f1ad049e Mon Sep 17 00:00:00 2001 From: Petr Vobornik Date: Tue, 1 Jul 2014 18:16:14 +0200 Subject: webui-build: use /usr/share/java/js.jar instead of rhino.jar /usr/share/java/rhino.jar is a Fedora's symlink to /usr/share/java/js.jar Debian doesn't have it. Direct usage of upstream /usr/share/java/js.jar should work on both systems. Reviewed-By: Timo Aaltonen --- install/ui/util/build.sh | 2 +- install/ui/util/uglifyjs/uglify | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/install/ui/util/build.sh b/install/ui/util/build.sh index 03776c1fe..2e0eb13c8 100755 --- a/install/ui/util/build.sh +++ b/install/ui/util/build.sh @@ -31,6 +31,6 @@ if [[ ! $profile ]] ; then exit 1 fi -RHINO="java -Xss${JAVA_STACK_SIZE:-512k} -classpath /usr/share/java/rhino.jar org.mozilla.javascript.tools.shell.Main" +RHINO="java -Xss${JAVA_STACK_SIZE:-512k} -classpath /usr/share/java/js.jar org.mozilla.javascript.tools.shell.Main" $RHINO $DIR/build/build.js baseUrl=$DIR/build load=build profile=$DIR/../src/$profile.profile.js exit $? diff --git a/install/ui/util/uglifyjs/uglify b/install/ui/util/uglifyjs/uglify index 1227f589b..dcd3b7336 100755 --- a/install/ui/util/uglifyjs/uglify +++ b/install/ui/util/uglifyjs/uglify @@ -25,7 +25,7 @@ DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )" # rhino-1.7R4 doesn't have -main option to enable CommonJS support. It was # replaced by -require option. -RHINO="java -Xss${JAVA_STACK_SIZE:-512k} -classpath /usr/share/java/rhino.jar org.mozilla.javascript.tools.shell.Main" +RHINO="java -Xss${JAVA_STACK_SIZE:-512k} -classpath /usr/share/java/js.jar org.mozilla.javascript.tools.shell.Main" if [ `$RHINO --help | grep -e -require | wc -l` -gt 0 ] ; then $RHINO -require $DIR/uglify-js.js $@ else -- cgit