3 files changed, 7 insertions, 5 deletions
diff --git a/libre/java8-openjdk/PKGBUILD b/libre/java8-openjdk/PKGBUILD
index 8f9c3cffb..b0e48a3d3 100644
--- a/libre/java8-openjdk/PKGBUILD
+++ b/libre/java8-openjdk/PKGBUILD
@@ -15,7 +15,7 @@ _jdk_update=20
 _jdk_build=23
 pkgver=${_java_ver}.u${_jdk_update}
 _repo_ver=jdk${_java_ver}u${_jdk_update}-b${_jdk_build}
-pkgrel=1.parabola1
+pkgrel=2.parabola1
 arch=('i686' 'x86_64')
 url='http://openjdk.java.net/'
 license=('custom')
diff --git a/libre/java8-openjdk/install_jdk8-openjdk.sh b/libre/java8-openjdk/install_jdk8-openjdk.sh
index 33f3fe77f..5aa420d24 100644
--- a/libre/java8-openjdk/install_jdk8-openjdk.sh
+++ b/libre/java8-openjdk/install_jdk8-openjdk.sh
@@ -13,7 +13,7 @@ post_install() {
   fi
 
   if [ ! -f /etc/ssl/certs/java/cacerts ]; then
-    JAVA_HOME=/usr/lib/jvm/java-default-runtime /usr/bin/init-jks-keystore
+    JAVA_HOME=/usr/lib/jvm/${this_java} /usr/bin/init-jks-keystore
   fi
 }
 
@@ -26,7 +26,7 @@ post_upgrade() {
   fi
 
   if [ ! -f /etc/ssl/certs/java/cacerts ]; then
-    JAVA_HOME=/usr/lib/jvm/java-default-runtime /usr/bin/init-jks-keystore
+    JAVA_HOME=/usr/lib/jvm/${this_java} /usr/bin/init-jks-keystore
   fi
 }
 
diff --git a/libre/java8-openjdk/install_jre8-openjdk-headless.sh b/libre/java8-openjdk/install_jre8-openjdk-headless.sh
index 7e2834984..c2fec654e 100644
--- a/libre/java8-openjdk/install_jre8-openjdk-headless.sh
+++ b/libre/java8-openjdk/install_jre8-openjdk-headless.sh
@@ -13,7 +13,9 @@ post_install() {
   fi
 
   if [ ! -f /etc/ssl/certs/java/cacerts ]; then
-    JAVA_HOME=/usr/lib/jvm/java-default-runtime /usr/bin/init-jks-keystore
+    # Overwrite JAVA_HOME because if it still points at java-8-openjdk AND user just removed jdk,
+    # Then /usr/bin/java will in the end, refer to /usr/lib/jvm/java-7-openjdk/java which doesn't exist
+    JAVA_HOME=/usr/lib/jvm/${this_java} /usr/bin/init-jks-keystore
   fi
 }
 
@@ -26,7 +28,7 @@ post_upgrade() {
   fi
 
   if [ ! -f /etc/ssl/certs/java/cacerts ]; then
-    JAVA_HOME=/usr/lib/jvm/java-default-runtime /usr/bin/init-jks-keystore
+    JAVA_HOME=/usr/lib/jvm/${this_java} /usr/bin/init-jks-keystore
   fi
 }