From d6a1f0698a02b73f73128b279e6921970554c1e6 Mon Sep 17 00:00:00 2001 From: Christian Egli Date: Tue, 8 Oct 2024 16:28:03 +0200 Subject: [PATCH] Introduce an env var for java17 so that dtbook-hyphenator can be invoked with a more modern java, since it no longer works with java8 --- .../documents/preview/dtbook2sbsform.clj | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/src/clj/daisyproducer2/documents/preview/dtbook2sbsform.clj b/src/clj/daisyproducer2/documents/preview/dtbook2sbsform.clj index 0329ed2..3e8c4c2 100644 --- a/src/clj/daisyproducer2/documents/preview/dtbook2sbsform.clj +++ b/src/clj/daisyproducer2/documents/preview/dtbook2sbsform.clj @@ -8,7 +8,8 @@ [babashka.process :as process] [clojure.string :as str] [clojure.tools.logging :as log] - [clojure.java.io :as io])) + [clojure.java.io :as io] + [daisyproducer2.config :refer [env]])) (def ^:private executable "/opt/dtbook2sbsform/dtbook2sbsform.sh") @@ -37,10 +38,11 @@ (defn- hyphenate [dtbook] - (process/shell - {:out :string - :pre-start-fn log-process} - "/usr/bin/java" "-jar" "/usr/local/share/java/dtbook-hyphenator.jar" dtbook)) + (let [java (env :java17)] + (process/shell + {:out :string + :pre-start-fn log-process} + java "-jar" "/usr/local/share/java/dtbook-hyphenator.jar" dtbook))) (defn- hyphenate-and-translate [dtbook output-path opts]