diff --git a/tika-gui-app/assemblies/assembly-linux_x64.xml b/tika-gui-app/assemblies/assembly-linux_x64.xml index 5a53679..dd52042 100644 --- a/tika-gui-app/assemblies/assembly-linux_x64.xml +++ b/tika-gui-app/assemblies/assembly-linux_x64.xml @@ -30,23 +30,6 @@ README* - - ${project.basedir}/target/jres/linux_x64/zulu17.38.21-ca-fx-jre17.0.5-linux_x64 - jre - - bin/java - lib/jspawnhelper - - - - ${project.basedir}/target/jres/linux_x64/zulu17.38.21-ca-fx-jre17.0.5-linux_x64 - jre - - bin/java - lib/jspawnhelper - - 0755 - ${project.basedir}/config config @@ -57,6 +40,10 @@ + + ${project.basedir}/target/jres/linux_x64/zulu17.38.21-ca-fx-jre17.0.5-linux_x64.tar.gz + jre + ${project.basedir}/bin/tika-gui.sh diff --git a/tika-gui-app/bin/tika-gui.sh b/tika-gui-app/bin/tika-gui.sh index 7066f73..2117d88 100644 --- a/tika-gui-app/bin/tika-gui.sh +++ b/tika-gui-app/bin/tika-gui.sh @@ -18,6 +18,13 @@ #TODO: update the script to find the executable, whether it # is under the jdk name or the aarch Contents/Home/ stuff. # Can we do anything better than chmod? +if [ ! -d "jre/zulu17.38.21-ca-fx-jre17.0.5-linux_x64" ] +then + echo "Unpacking zipped jre." + cd jre + tar -xzvf zulu17.38.21-ca-fx-jre17.0.5-linux_x64.tar.gz + cd .. && mv jre/zulu17.38.21-ca-fx-jre17.0.5-linux_x64/* jre +fi JAVA_HOME="jre" JAVA_BIN="$JAVA_HOME/bin" diff --git a/tika-gui-app/pom.xml b/tika-gui-app/pom.xml index e07c6c3..be14f6f 100644 --- a/tika-gui-app/pom.xml +++ b/tika-gui-app/pom.xml @@ -194,60 +194,52 @@ download-maven-plugin - tika-async-cli-2.6.1-20221118.172836-55 + tika-async-cli-2.6.1-20221119.225241-59 prepare-package wget - - https://repository.apache.org/content/groups/snapshots/org/apache/tika/tika-async-cli/2.6.1-SNAPSHOT/tika-async-cli-2.6.1-20221118.172836-55.jar - + https://repository.apache.org/content/groups/snapshots/org/apache/tika/tika-async-cli/2.6.1-SNAPSHOT/tika-async-cli-2.6.1-20221119.225241-59.jar false ${project.build.directory}/lib/tika-core 59ec0de6c2f1a704af1cda6ea894ad92 - tika-fetcher-s3-2.6.1-20221118.172836-56 + tika-fetcher-s3-2.6.1-20221119.225241-60 prepare-package wget - - https://repository.apache.org/content/groups/snapshots/org/apache/tika/tika-fetcher-s3/2.6.1-SNAPSHOT/tika-fetcher-s3-2.6.1-20221118.172836-56.jar - + https://repository.apache.org/content/groups/snapshots/org/apache/tika/tika-fetcher-s3/2.6.1-SNAPSHOT/tika-fetcher-s3-2.6.1-20221119.225241-60.jar false ${project.build.directory}/lib/tika-fetcher-s3 - 255f57cb859c2e56dbc2431a008e6688 + d5ca59d85a722eae298ebd11532c16f2 - tika-parser-sqlite3-package-2.6.1-20221118.172836-57 + tika-parser-sqlite3-package-2.6.1-20221119.225241-61 prepare-package wget - - https://repository.apache.org/content/groups/snapshots/org/apache/tika/tika-parser-sqlite3-package/2.6.1-SNAPSHOT/tika-parser-sqlite3-package-2.6.1-20221118.172836-57.jar - + https://repository.apache.org/content/groups/snapshots/org/apache/tika/tika-parser-sqlite3-package/2.6.1-SNAPSHOT/tika-parser-sqlite3-package-2.6.1-20221119.225241-61.jar false ${project.build.directory}/lib/tika-app 49f8344436def4aac458800be9f822fd - tika-pipes-reporter-fs-status-2.6.1-20221118.172836-55 + tika-pipes-reporter-fs-status-2.6.1-20221119.225241-59 prepare-package wget - - https://repository.apache.org/content/groups/snapshots/org/apache/tika/tika-pipes-reporter-fs-status/2.6.1-SNAPSHOT/tika-pipes-reporter-fs-status-2.6.1-20221118.172836-55.jar - + https://repository.apache.org/content/groups/snapshots/org/apache/tika/tika-pipes-reporter-fs-status/2.6.1-SNAPSHOT/tika-pipes-reporter-fs-status-2.6.1-20221119.225241-59.jar false ${project.build.directory}/lib/tika-core 3f4d6165f26a63b1a7460e11ef75de87 @@ -280,60 +272,52 @@ - tika-emitter-fs-2.6.1-20221118.172836-55 + tika-emitter-fs-2.6.1-20221119.225241-59 prepare-package wget - - https://repository.apache.org/content/groups/snapshots/org/apache/tika/tika-emitter-fs/2.6.1-SNAPSHOT/tika-emitter-fs-2.6.1-20221118.172836-55.jar - + https://repository.apache.org/content/groups/snapshots/org/apache/tika/tika-emitter-fs/2.6.1-SNAPSHOT/tika-emitter-fs-2.6.1-20221119.225241-59.jar false ${project.build.directory}/lib/tika-emitter-fs 742afc0927cb4e3c7871378a4125da48 - tika-emitter-jdbc-2.6.1-20221118.172836-55 + tika-emitter-jdbc-2.6.1-20221119.225241-59 prepare-package wget - - https://repository.apache.org/content/groups/snapshots/org/apache/tika/tika-emitter-jdbc/2.6.1-SNAPSHOT/tika-emitter-jdbc-2.6.1-20221118.172836-55.jar - + https://repository.apache.org/content/groups/snapshots/org/apache/tika/tika-emitter-jdbc/2.6.1-SNAPSHOT/tika-emitter-jdbc-2.6.1-20221119.225241-59.jar false ${project.build.directory}/lib/tika-emitter-jdbc 70175ae9f014557cf33a9fcf2a751f6d - tika-pipes-reporter-jdbc-2.6.1-20221118.172836-10 + tika-pipes-reporter-jdbc-2.6.1-20221119.225241-14 prepare-package wget - - https://repository.apache.org/content/groups/snapshots/org/apache/tika/tika-pipes-reporter-jdbc/2.6.1-SNAPSHOT/tika-pipes-reporter-jdbc-2.6.1-20221118.172836-10.jar - + https://repository.apache.org/content/groups/snapshots/org/apache/tika/tika-pipes-reporter-jdbc/2.6.1-SNAPSHOT/tika-pipes-reporter-jdbc-2.6.1-20221119.225241-14.jar false ${project.build.directory}/lib/tika-core 0b3621a9b81cb93c69146f1e8e2a4b70 - tika-eval-core-2.6.1-20221118.172836-55 + tika-eval-core-2.6.1-20221119.225241-59 prepare-package wget - - https://repository.apache.org/content/groups/snapshots/org/apache/tika/tika-eval-core/2.6.1-SNAPSHOT/tika-eval-core-2.6.1-20221118.172836-55.jar - + https://repository.apache.org/content/groups/snapshots/org/apache/tika/tika-eval-core/2.6.1-SNAPSHOT/tika-eval-core-2.6.1-20221119.225241-59.jar false ${project.build.directory}/lib/tika-extras be64e5f6865596ee2556b0a61df9e887 @@ -353,93 +337,81 @@ - tika-pipes-iterator-s3-2.6.1-20221118.172836-55 + tika-pipes-iterator-s3-2.6.1-20221119.225241-59 prepare-package wget - - https://repository.apache.org/content/groups/snapshots/org/apache/tika/tika-pipes-iterator-s3/2.6.1-SNAPSHOT/tika-pipes-iterator-s3-2.6.1-20221118.172836-55.jar - + https://repository.apache.org/content/groups/snapshots/org/apache/tika/tika-pipes-iterator-s3/2.6.1-SNAPSHOT/tika-pipes-iterator-s3-2.6.1-20221119.225241-59.jar false ${project.build.directory}/lib/tika-pipes-iterator-s3 - 777f7df5402f4c2f2584b5aa966ab5b8 + 6a77c252415b59cdd1eddeedf018e9a1 - tika-serialization-2.6.1-20221118.172836-57 + tika-serialization-2.6.1-20221119.225241-61 prepare-package wget - - https://repository.apache.org/content/groups/snapshots/org/apache/tika/tika-serialization/2.6.1-SNAPSHOT/tika-serialization-2.6.1-20221118.172836-57.jar - + https://repository.apache.org/content/groups/snapshots/org/apache/tika/tika-serialization/2.6.1-SNAPSHOT/tika-serialization-2.6.1-20221119.225241-61.jar false ${project.build.directory}/lib/tika-core 56d49201c8f4aeccd822010ece7881a9 - tika-detector-siegfried-2.6.1-20221118.172836-54 + tika-detector-siegfried-2.6.1-20221119.225241-58 prepare-package wget - - https://repository.apache.org/content/groups/snapshots/org/apache/tika/tika-detector-siegfried/2.6.1-SNAPSHOT/tika-detector-siegfried-2.6.1-20221118.172836-54.jar - + https://repository.apache.org/content/groups/snapshots/org/apache/tika/tika-detector-siegfried/2.6.1-SNAPSHOT/tika-detector-siegfried-2.6.1-20221119.225241-58.jar false ${project.build.directory}/lib/tika-extras e41ece509888fea478476fbd5b35d7f9 - tika-emitter-opensearch-2.6.1-20221118.172836-55 + tika-emitter-opensearch-2.6.1-20221119.225241-59 prepare-package wget - - https://repository.apache.org/content/groups/snapshots/org/apache/tika/tika-emitter-opensearch/2.6.1-SNAPSHOT/tika-emitter-opensearch-2.6.1-20221118.172836-55.jar - + https://repository.apache.org/content/groups/snapshots/org/apache/tika/tika-emitter-opensearch/2.6.1-SNAPSHOT/tika-emitter-opensearch-2.6.1-20221119.225241-59.jar false ${project.build.directory}/lib/tika-emitter-opensearch - 2b067643526f272f23dca839b245db45 + 7d7c92f400fe4696e28f4cbe1d85db66 - tika-emitter-s3-2.6.1-20221118.172836-55 + tika-emitter-s3-2.6.1-20221119.225241-59 prepare-package wget - - https://repository.apache.org/content/groups/snapshots/org/apache/tika/tika-emitter-s3/2.6.1-SNAPSHOT/tika-emitter-s3-2.6.1-20221118.172836-55.jar - + https://repository.apache.org/content/groups/snapshots/org/apache/tika/tika-emitter-s3/2.6.1-SNAPSHOT/tika-emitter-s3-2.6.1-20221119.225241-59.jar false ${project.build.directory}/lib/tika-emitter-s3 - de12c84701e07a74657221644f88d66c + 24ec5addad32e44b3191e32d264eb6db - tika-app-2.6.1-20221118.172836-55 + tika-app-2.6.1-20221119.225241-59 prepare-package wget - - https://repository.apache.org/content/groups/snapshots/org/apache/tika/tika-app/2.6.1-SNAPSHOT/tika-app-2.6.1-20221118.172836-55.jar - + https://repository.apache.org/content/groups/snapshots/org/apache/tika/tika-app/2.6.1-SNAPSHOT/tika-app-2.6.1-20221119.225241-59.jar false ${project.build.directory}/lib/tika-app - b993db232772c9aeff74546f4e1622b5 + 62045f549d348ce115b4deffdbff78c7 @@ -489,7 +461,7 @@ https://cdn.azul.com/zulu/bin/zulu17.38.21-ca-fx-jre17.0.5-linux_x64.tar.gz - true + false ${project.build.directory}/jres/linux_x64 50c9a14c44823db4e789e1ac7b2253f0194f9177e11c9fe6648089be3d611c97 diff --git a/tika-gui-tools/src/main/java/org/tallison/tika/gui/tools/DownloadPluginUpdater.java b/tika-gui-tools/src/main/java/org/tallison/tika/gui/tools/DownloadPluginUpdater.java index e4ecd62..590298c 100644 --- a/tika-gui-tools/src/main/java/org/tallison/tika/gui/tools/DownloadPluginUpdater.java +++ b/tika-gui-tools/src/main/java/org/tallison/tika/gui/tools/DownloadPluginUpdater.java @@ -109,7 +109,6 @@ private static void getDependencies(String dependenciesProps, StringBuilder sb) Properties properties = new Properties(); properties.load(DownloadPluginUpdater.class.getResourceAsStream( dependenciesProps)); - sb.append(DEPENDENCIES_TEMPLATE_START); for (Object path : properties.keySet()) { Object subdir = properties.get(path); String p = (String) path; @@ -165,7 +164,7 @@ private static void getZulu(StringBuilder sb) throws Exception { t = t.replace("{SHA256}", p.sha256); t = t.replace("{URL}", p.url); t = t.replace("{SUB_DIR}", osArch); - if (osArch.equals("linux_x64") || osArch.equals("win_x64")) { + if (osArch.equals("win_x64")) { t = t.replace("false", "true"); } sb.append(t);