[arch-commits] Commit in java8-openjdk/trunk (3 files)

[Guillaume Alaux]

    Date: Monday, September 15, 2014 @ 22:20:50
  Author: guillaume
Revision: 221784

Fix INSTALL call to init-jks-keystore

Modified:
  java8-openjdk/trunk/PKGBUILD
  java8-openjdk/trunk/install_jdk8-openjdk.sh
  java8-openjdk/trunk/install_jre8-openjdk-headless.sh

----------------------------------+
 PKGBUILD                         |    2 +-
 install_jdk8-openjdk.sh          |    4 ++--
 install_jre8-openjdk-headless.sh |    6 ++++--
 3 files changed, 7 insertions(+), 5 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2014-09-15 20:19:56 UTC (rev 221783)
+++ PKGBUILD	2014-09-15 20:20:50 UTC (rev 221784)
@@ -14,7 +14,7 @@
 _jdk_build=23
 pkgver=${_java_ver}.u${_jdk_update}
 _repo_ver=jdk${_java_ver}u${_jdk_update}-b${_jdk_build}
-pkgrel=1
+pkgrel=2
 arch=('i686' 'x86_64')
 url='http://openjdk.java.net/'
 license=('custom')

Modified: install_jdk8-openjdk.sh
===================================================================
--- install_jdk8-openjdk.sh	2014-09-15 20:19:56 UTC (rev 221783)
+++ install_jdk8-openjdk.sh	2014-09-15 20:20:50 UTC (rev 221784)
@@ -13,7 +13,7 @@
   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 @@
   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
 }
 

Modified: install_jre8-openjdk-headless.sh
===================================================================
--- install_jre8-openjdk-headless.sh	2014-09-15 20:19:56 UTC (rev 221783)
+++ install_jre8-openjdk-headless.sh	2014-09-15 20:20:50 UTC (rev 221784)
@@ -13,7 +13,9 @@
   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 @@
   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
 }