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

[Guillaume Alaux]

    Date: Monday, September 15, 2014 @ 22:19:56
  Author: guillaume
Revision: 221783

Fix INSTALL call to init-jks-keystore

Modified:
  java7-openjdk/trunk/PKGBUILD
  java7-openjdk/trunk/jdk7-openjdk.install
  java7-openjdk/trunk/jre7-openjdk-headless.install

-------------------------------+
 PKGBUILD                      |    2 +-
 jdk7-openjdk.install          |    4 ++--
 jre7-openjdk-headless.install |    4 ++--
 3 files changed, 5 insertions(+), 5 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2014-09-15 20:14:42 UTC (rev 221782)
+++ PKGBUILD	2014-09-15 20:19:56 UTC (rev 221783)
@@ -14,7 +14,7 @@
 _bootstrap=0 # 0/1 for quick build or full bootstrap
 
 pkgver=${_java_ver}.u${_JDK_UPDATE_VERSION}_${_icedtea_ver}
-pkgrel=1
+pkgrel=2
 arch=('i686' 'x86_64')
 url='http://icedtea.classpath.org'
 license=('custom')

Modified: jdk7-openjdk.install
===================================================================
--- jdk7-openjdk.install	2014-09-15 20:14:42 UTC (rev 221782)
+++ jdk7-openjdk.install	2014-09-15 20:19:56 UTC (rev 221783)
@@ -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: jre7-openjdk-headless.install
===================================================================
--- jre7-openjdk-headless.install	2014-09-15 20:14:42 UTC (rev 221782)
+++ jre7-openjdk-headless.install	2014-09-15 20:19:56 UTC (rev 221783)
@@ -15,7 +15,7 @@
   if [ ! -f /etc/ssl/certs/java/cacerts ]; then
     # Overwrite JAVA_HOME because if it still points at java-7-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/java-default-runtime /usr/bin/init-jks-keystore
+    JAVA_HOME=/usr/lib/jvm/${this_java} /usr/bin/init-jks-keystore
   fi
 }
 
@@ -28,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
 }