From 1a8eefc20fdaaf9c8924c1ab0e98e6a594b32131 Mon Sep 17 00:00:00 2001
From: =?utf8?q?Reimar=20D=C3=B6ffinger?= <Reimar.Doeffinger@gmx.de>
Date: Sat, 25 Apr 2020 11:47:23 +0200
Subject: [PATCH] Change scripts to be able to use a native-image binary
 instead.

---
 WiktionarySplitter.sh | 16 ++++++++++------
 convert_to_v6.sh      | 10 +++++++---
 run.sh                | 24 ++++++++++++++----------
 update_dict_list.sh   | 11 +++++++----
 4 files changed, 38 insertions(+), 23 deletions(-)

diff --git a/WiktionarySplitter.sh b/WiktionarySplitter.sh
index 87593bb..66d38a2 100755
--- a/WiktionarySplitter.sh
+++ b/WiktionarySplitter.sh
@@ -1,8 +1,12 @@
 # Run after downloading (data/downloadInputs.sh) to generate
 # per-language data files from enwiktionary.
-ICU4J=/usr/share/java/icu4j-49.1.jar
-test -r "$ICU4J" || ICU4J=/usr/share/icu4j-55/lib/icu4j.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" -Xmx4096m -Xverify:none -classpath bin/:"$ICU4J":"$COMMONS_COMPRESS" com.hughes.android.dictionary.engine.WiktionarySplitter "$@"
+RUNNER=./DictionaryPC
+if ! test -x "$RUNNER" ; then
+  ICU4J=/usr/share/java/icu4j-49.1.jar
+  test -r "$ICU4J" || ICU4J=/usr/share/icu4j-55/lib/icu4j.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
+  RUNNER="$JAVA -Xmx4096m -Xverify:none -classpath bin/:$ICU4J:$COMMONS_COMPRESS com.hughes.android.dictionary.engine.Runner"
+fi
+$RUNNER WiktionarySplitter "$@"
diff --git a/convert_to_v6.sh b/convert_to_v6.sh
index 3b6bd5c..2443c1c 100755
--- a/convert_to_v6.sh
+++ b/convert_to_v6.sh
@@ -1,3 +1,7 @@
-JAVA=/usr/lib/jvm/java-8-openjdk-amd64/jre/bin/java
-test -x "$JAVA" || JAVA=java
-"$JAVA" -classpath bin/ com.hughes.android.dictionary.engine.ConvertToV6 "$@"
+RUNNER=./DictionaryPC
+if ! test -x "$RUNNER" ; then
+  JAVA=/usr/lib/jvm/java-8-openjdk-amd64/jre/bin/java
+  test -x "$JAVA" || JAVA=java
+  RUNNER="$JAVA -classpath bin/ com.hughes.android.dictionary.engine.Runner"
+fi
+$RUNNER ConvertToV6 "$@"
diff --git a/run.sh b/run.sh
index 5a6b5ce..3a3c1d9 100755
--- a/run.sh
+++ b/run.sh
@@ -1,10 +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_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/jre/bin/java
-test -x "$JAVA" || JAVA=java
-"$JAVA" -Djava.util.logging.config.file="logging.properties" -Xmx4096m -classpath bin/:"$ICU4J":"$COMMONS_LANG3":"$COMMONS_TEXT":"$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-49.1.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/jre/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 "$@"
diff --git a/update_dict_list.sh b/update_dict_list.sh
index 2901a92..3d09064 100755
--- a/update_dict_list.sh
+++ b/update_dict_list.sh
@@ -1,6 +1,9 @@
 # Run to update ..//Dictionary/res/raw/dictionary_info.txt to reference
 # all dictionaries in /data/outputs (needs to contain both zip and uncompressed files).
-CLASS=CheckDictionariesMain
-JAVA=/usr/lib/jvm/java-8-openjdk-amd64/jre/bin/java
-test -x "$JAVA" || JAVA=java
-$JAVA -classpath bin/:/usr/share/java/com.ibm.icu.jar com.hughes.android.dictionary.engine.$CLASS "$@"
+RUNNER=./DictionaryPC
+if ! test -x "$RUNNER" ; then
+  JAVA=/usr/lib/jvm/java-8-openjdk-amd64/jre/bin/java
+  test -x "$JAVA" || JAVA=java
+  RUNNER="$JAVA -classpath bin/:/usr/share/java/com.ibm.icu.jar com.hughes.android.dictionary.engine.Runner"
+fi
+$RUNNER CheckDictionariesMain "$@"
-- 
2.43.0