From 39aee479378d00e10bcc67f01e75f27913d8fcf4 Mon Sep 17 00:00:00 2001 From: Peter Hormanns Date: Thu, 16 Nov 2023 14:29:45 +0100 Subject: [PATCH] hsscript and java17 --- cli/src/deb/bin/hsscript | 7 +++---- cli/src/deb/control/control | 2 +- 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/cli/src/deb/bin/hsscript b/cli/src/deb/bin/hsscript index e336f54..9c5a99a 100644 --- a/cli/src/deb/bin/hsscript +++ b/cli/src/deb/bin/hsscript @@ -1,6 +1,5 @@ #!/bin/bash -JAVA_HOME=/usr/lib/jvm/java-11-openjdk-amd64/ -getconf LONG_BIT | grep 32 >/dev/null && JAVA_HOME=/usr/lib/jvm/java-11-openjdk-i386/ +JAVA_HOME=/usr/lib/jvm/java-17-openjdk-amd64 +ls /usr/lib/jvm/java-11-openjdk-amd64 >/dev/null 2>&1 && JAVA_HOME=/usr/lib/jvm/java-11-openjdk-amd64 JAVA=$JAVA_HOME/bin/java -JVM_ARGS="-Dnashorn.args=--no-deprecation-warning" -exec $JAVA $JVM_ARGS -jar /usr/local/lib/hostsharing/hsadmin/hsscript-full.jar "$@" +exec $JAVA $JVM_ARGS -jar /usr/local/lib/hostsharing/hsadmin/hsscript-full.jar "$@" \ No newline at end of file diff --git a/cli/src/deb/control/control b/cli/src/deb/control/control index dfd4b84..958b36e 100644 --- a/cli/src/deb/control/control +++ b/cli/src/deb/control/control @@ -3,7 +3,7 @@ Version: [[version]] Section: misc Priority: optional Architecture: all -Depends: default-jre +Depends: openjdk-11-jre | openjdk-17-jre Maintainer: Peter Hormanns Description: hostsharing command and scripting shell Distribution: hostsharing \ No newline at end of file