Only exit script if no javapackager exists for configured JDK

This commit is contained in:
Christoph Atteneder 2019-02-21 16:13:19 +01:00
parent bde720f4d4
commit 8b5454ff3d
No known key found for this signature in database
GPG key ID: CD5DC1C529CDFD3B

View file

@ -7,11 +7,13 @@
# - Ensure JAVA_HOME below is pointing to OracleJDK 10 directory
version=0.9.3-SNAPSHOT
if [ ! -f "$JAVA_HOME/bin/javapackager" ] && [ -d "/usr/lib/jvm/jdk-10.0.2" ]; then
JAVA_HOME=/usr/lib/jvm/jdk-10.0.2
else
echo Javapackager not found. Update JAVA_HOME variable to point to OracleJDK.
exit 1
if [ ! -f "$JAVA_HOME/bin/javapackager" ]; then
if [ -d "/usr/lib/jvm/jdk-10.0.2" ]; then
JAVA_HOME=/usr/lib/jvm/jdk-10.0.2
else
echo Javapackager not found. Update JAVA_HOME variable to point to OracleJDK.
exit 1
fi
fi
base_dir=$( cd "$(dirname "$0")" ; pwd -P )/../../..