hostsharing/hs.hsadmin.jee
8
0
Fork 0
Code Pull Requests Activity

run hsscript on java-11

Browse Source
This commit is contained in:
Peter Hormanns 2020-07-03 19:00:57 +02:00
parent ade38796a5
commit 12499aae20
2 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
cli/pom.xml
View File

@ -8,7 +8,7 @@
<version>1.0-SNAPSHOT</version> <version>1.0-SNAPSHOT</version>
</parent> </parent>
<artifactId>hsadmin-cli</artifactId> <artifactId>hsadmin-cli</artifactId>
<version>1.1.2</version> <version>1.2.0</version>
<packaging>jar</packaging> <packaging>jar</packaging>
<name>HSAdmin-Cli</name> <name>HSAdmin-Cli</name>

7
cli/src/deb/bin/hsscript
View File

@ -1,5 +1,6 @@
#!/bin/bash #!/bin/bash
JAVA_HOME=/usr/lib/jvm/java-8-openjdk-amd64/ JAVA_HOME=/usr/lib/jvm/java-11-openjdk-amd64/
getconf LONG_BIT | grep 32 >/dev/null && JAVA_HOME=/usr/lib/jvm/java-8-openjdk-i386/ getconf LONG_BIT | grep 32 >/dev/null && JAVA_HOME=/usr/lib/jvm/java-11-openjdk-i386/
JAVA=$JAVA_HOME/bin/java JAVA=$JAVA_HOME/bin/java
exec $JAVA -jar /usr/local/lib/hostsharing/hsadmin/hsscript-full.jar "$@" JVM_ARGS="-Dnashorn.args=--no-deprecation-warning"
exec $JAVA $JVM_ARGS -jar /usr/local/lib/hostsharing/hsadmin/hsscript-full.jar "$@"