From 8b5454ff3db19df6b320be5bf2409b0827e086cd Mon Sep 17 00:00:00 2001
From: Christoph Atteneder <christoph.atteneder@gmail.com>
Date: Thu, 21 Feb 2019 16:13:19 +0100
Subject: [PATCH] Only exit script if no javapackager exists for configured JDK

---
 desktop/package/linux/package.sh | 12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)

diff --git a/desktop/package/linux/package.sh b/desktop/package/linux/package.sh
index 4135e4f070..f854042e9a 100755
--- a/desktop/package/linux/package.sh
+++ b/desktop/package/linux/package.sh
@@ -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 )/../../..