1 files changed, 32 insertions, 20 deletions
diff --git a/libre/java8-openjdk/install_jdk8-openjdk.sh b/libre/java8-openjdk/install_jdk8-openjdk.sh
index 5aa420d24..9181a7769 100644
--- a/libre/java8-openjdk/install_jdk8-openjdk.sh
+++ b/libre/java8-openjdk/install_jdk8-openjdk.sh
@@ -1,38 +1,50 @@
-this_java='java-8-openjdk'
+THIS_JDK='java-8-openjdk'
 
-post_install() {
-  default=$(/usr/bin/parabola-java get)
-  if [ -z "${default}" ]; then
-    /usr/bin/parabola-java set ${this_java}
-  elif [ "${default/\/jre}" = "${this_java/\/jre}" ]; then
-    /usr/bin/parabola-java fix
+fix_default() {
+  if [ ! -x /usr/bin/java ]; then
+    /usr/bin/parabola-java unset
+    echo ""
   else
-    echo "Default Java environment is already set to '${default}'"
-    echo "To set '${this_java}' as default, consider using:"
-    echo "  parabola-java set '${this_java}'"
+    /usr/bin/parabola-java get
   fi
+}
+
+post_install() {
+  default=$(fix_default)
+  case ${default} in
+    "" | ${THIS_JDK}/jre)
+      /usr/bin/parabola-java set ${THIS_JDK}
+      ;;
+    ${THIS_JDK})
+      # Nothing
+      ;;
+    *)
+      echo "Default Java environment is already set to '${default}'"
+      echo "See 'parabola-java help' to change it"
+      ;;
+  esac
 
   if [ ! -f /etc/ssl/certs/java/cacerts ]; then
-    JAVA_HOME=/usr/lib/jvm/${this_java} /usr/bin/init-jks-keystore
+    /usr/bin/init-jks-keystore
   fi
 }
 
 post_upgrade() {
-  default=$(/usr/bin/parabola-java get)
-  if [ -z "${default}" ]; then
-    /usr/bin/parabola-java set ${this_java}
-  elif [ "${default/\/jre}" = "${this_java/\/jre}" ]; then
-    /usr/bin/parabola-java fix
+  default=$(fix_default)
+  if [ -z "${default}" -o "x${default}" = "x${THIS_JDK}/jre" ]; then
+    /usr/bin/parabola-java set ${THIS_JDK}
   fi
 
   if [ ! -f /etc/ssl/certs/java/cacerts ]; then
-    JAVA_HOME=/usr/lib/jvm/${this_java} /usr/bin/init-jks-keystore
+    /usr/bin/init-jks-keystore
   fi
 }
 
 pre_remove() {
-  default=$(/usr/bin/parabola-java get)
-  if [ "${default/\/jre}" = "${this_java/\/jre}" ]; then
-    /usr/bin/parabola-java set ${this_java}/jre
+  if [ "x$(fix_default)" = "x${THIS_JDK}" ]; then
+    sudo /usr/bin/parabola-java unset
+    if [ -x /usr/lib/jvm/${THIS_JDK}/jre/bin/java ]; then
+      sudo /usr/bin/parabola-java set ${THIS_JDK}/jre
+    fi
   fi
 }