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

diff --git a/run.sh b/run.sh
index 1351418..89503bf 100755
--- a/run.sh
+++ b/run.sh
@@ -1,14 +1,8 @@
+#!/bin/bash
+
 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
+  . javalibs.sh
   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 "$@"