More generic run scripts.

diff --git a/WiktionarySplitter.sh b/WiktionarySplitter.sh
index 5c4a7528cb02c828c54e4f6ca58f54814bcc7302..a2a968042a5cdbda7cf7de88825b579ed436f8af 100755 (executable)
--- a/WiktionarySplitter.sh
+++ b/WiktionarySplitter.sh
@@ -1,3 +1,9 @@
 # Run after downloading (data/downloadInputs.sh) to generate
 # per-language data files from enwiktionary.
-/usr/lib/jvm/java-8-openjdk-amd64/jre/bin/java -classpath src:../Util/src/:../Dictionary/src/:/usr/share/java/com.ibm.icu.jar:/usr/share/java/xercesImpl.jar com.hughes.android.dictionary.engine.WiktionarySplitter "$@"
+ICU4J=/usr/share/java/icu4j-49.1.jar
+test -r "$ICU4J" || ICU4J=/usr/share/icu4j-55/lib/icu4j.jar
+XERCES=/usr/share/java/xercesImpl.jar
+test -r "$XERCES" || XERCES=/usr/share/xerces-2/lib/xercesImpl.jar
+JAVA=/usr/lib/jvm/java-8-openjdk-amd64/jre/bin/java
+test -x "$JAVA" || JAVA=java
+"$JAVA" -classpath src:../Util/src/:../Dictionary/src/:"$ICU4J":"$XERCES" com.hughes.android.dictionary.engine.WiktionarySplitter "$@"

diff --git a/run.sh b/run.sh
index cb4349fcb3f14cfdd5b4295d868fac28eca59673..3ca360ccf14ba37ddcff0f30ae52abd05ea30583 100755 (executable)
--- a/run.sh
+++ b/run.sh
@@ -1,2 +1,10 @@
 # -agentlib:hprof=heap=sites,depth=20
-/usr/lib/jvm/java-8-openjdk-amd64/jre/bin/java -Xmx4096m -classpath src:../Util/src/:../Dictionary/src/:/usr/share/java/icu4j-49.1.jar:/usr/share/java/xercesImpl.jar:/usr/share/java/commons-lang3.jar com.hughes.android.dictionary.engine.DictionaryBuilder "$@"
+ICU4J=/usr/share/java/icu4j-49.1.jar
+test -r "$ICU4J" || ICU4J=/usr/share/icu4j-55/lib/icu4j.jar
+XERCES=/usr/share/java/xercesImpl.jar
+test -r "$XERCES" || XERCES=/usr/share/xerces-2/lib/xercesImpl.jar
+COMMONS=/usr/share/java/commons-lang3.jar
+test -r "$COMMONS" || COMMONS=/usr/share/commons-lang-3.3/lib/commons-lang.jar
+JAVA=/usr/lib/jvm/java-8-openjdk-amd64/jre/bin/java
+test -x "$JAVA" || JAVA=java
+"$JAVA" -Xmx4096m -classpath src:../Util/src/:../Dictionary/src/:"$ICU4J":"$XERCES":"$COMMONS" com.hughes.android.dictionary.engine.DictionaryBuilder "$@"