X-Git-Url: http://gitweb.fperrin.net/?a=blobdiff_plain;f=run.sh;h=13514180fcbb78e40f59f02c3d33c2972e7dcf6f;hb=020aa910526ece05ee8514e55a9a951b45ce1fea;hp=fe03ef5662bdadf340d9f9fd602c9bb35f09b3a0;hpb=b7b04d01f8d0ed763f0817d0531ecebf9ff50260;p=DictionaryPC.git

diff --git a/run.sh b/run.sh
index fe03ef5..1351418 100755
--- a/run.sh
+++ b/run.sh
@@ -1,8 +1,14 @@
-# -agentlib:hprof=heap=sites,depth=20
-ICU4J=/usr/share/java/icu4j-49.1.jar
-test -r "$ICU4J" || ICU4J=/usr/share/icu4j-55/lib/icu4j.jar
-COMMONS=/usr/share/java/commons-text.jar
-COMMONS_COMPRESS=/usr/share/java/commons-compress.jar
-JAVA=/usr/lib/jvm/java-8-openjdk-amd64/jre/bin/java
-test -x "$JAVA" || JAVA=java
-"$JAVA" -Djava.util.logging.config.file="logging.properties" -Xmx4096m -classpath bin/:"$ICU4J":"$COMMONS":"$COMMONS_COMPRESS" com.hughes.android.dictionary.engine.DictionaryBuilder "$@"
+RUNNER=./DictionaryPC
+if ! test -x "$RUNNER" ; then
+  # -agentlib:hprof=heap=sites,depth=20
+  ICU4J=/usr/share/java/icu4j.jar
+  test -r "$ICU4J" || ICU4J=/usr/share/icu4j-55/lib/icu4j.jar
+  COMMONS_LANG3=/usr/share/java/commons-lang3.jar
+  test -r "$COMMONS_LANG3" || COMMONS_LANG3=/usr/share/commons-lang-3.3/lib/commons-lang.jar
+  COMMONS_TEXT=/usr/share/java/commons-text.jar
+  COMMONS_COMPRESS=/usr/share/java/commons-compress.jar
+  JAVA=/usr/lib/jvm/java-8-openjdk-amd64/bin/java
+  test -x "$JAVA" || JAVA=java
+  RUNNER="$JAVA -Djava.util.logging.config.file=logging.properties -Xmx4096m -classpath bin/:$ICU4J:$COMMONS_LANG3:$COMMONS_TEXT:$COMMONS_COMPRESS com.hughes.android.dictionary.engine.Runner"
+fi
+$RUNNER DictionaryBuilder "$@"