[arch-commits] Commit in ca-certificates-java/trunk (2 files)

[Jan de Groot]

    Date: Saturday, June 13, 2009 @ 08:40:19
  Author: jgc
Revision: 42365

upgpkg: ca-certificates-java 20081028-2

Modified:
  ca-certificates-java/trunk/PKGBUILD
  ca-certificates-java/trunk/ca-certificates-java.install

------------------------------+
 PKGBUILD                     |    2 +-
 ca-certificates-java.install |    9 ++++++++-
 2 files changed, 9 insertions(+), 2 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2009-06-13 12:34:06 UTC (rev 42364)
+++ PKGBUILD	2009-06-13 12:40:19 UTC (rev 42365)
@@ -3,7 +3,7 @@
 
 pkgname=ca-certificates-java
 pkgver=20081028
-pkgrel=1
+pkgrel=2
 pkgdesc='Common CA certificates (JKS keystore)'
 arch=('i686' 'x86_64')
 url='http://packages.qa.debian.org/c/ca-certificates-java.html'

Modified: ca-certificates-java.install
===================================================================
--- ca-certificates-java.install	2009-06-13 12:34:06 UTC (rev 42364)
+++ ca-certificates-java.install	2009-06-13 12:40:19 UTC (rev 42365)
@@ -1,6 +1,13 @@
 post_install() {
   if [ ! -f /etc/ssl/certs/java/cacerts ]; then
-    /usr/sbin/init-jks-keystore
+    for jvm in /usr/lib/jvm/java-1.6.0-openjdk /opt/java/jre; do
+      if [ -x $jvm/bin/keytool ]; then
+        break
+      fi
+    done
+    if [ -x $jvm/bin/keytool ]; then
+      /usr/sbin/init-jks-keystore
+    fi
   fi
 }