Move library search to a common file

[DictionaryPC.git] / convert_to_v6.sh

diff --git a/convert_to_v6.sh b/convert_to_v6.sh
index 3b6bd5cada6d8eca69d54f1ce708f810e58ae296..60cd01d3d95f6c5a455c88b9ff039b26658e74c4 100755 (executable)
--- a/convert_to_v6.sh
+++ b/convert_to_v6.sh
@@ -1,3 +1,8 @@
-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 "$@"
+#!/bin/bash
+
+RUNNER=./DictionaryPC
+if ! test -x "$RUNNER" ; then
+  . javalibs.sh
+  RUNNER="$JAVA -classpath bin/ com.hughes.android.dictionary.engine.Runner"
+fi
+$RUNNER ConvertToV6 "$@"