summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndré Fabian Silva Delgado <emulatorman@parabola.nu>2014-09-17 10:21:04 -0300
committerAndré Fabian Silva Delgado <emulatorman@parabola.nu>2014-09-17 10:21:04 -0300
commit4022f2349f5f09316815f53441a1510f2fc14809 (patch)
treee0418365b76c8b4400ad5b6a03ebccd587b5bc8e
parentfc2fa9ae12e09b7bb0f29224451ceea57572b69c (diff)
java7-openjdk-7.u65_2.5.2-2.parabola1: fix INSTALL call to init-jks-keystore
-rw-r--r--libre/java7-openjdk/PKGBUILD4
-rw-r--r--libre/java7-openjdk/jdk7-openjdk.install4
-rw-r--r--libre/java7-openjdk/jre7-openjdk-headless.install4
3 files changed, 6 insertions, 6 deletions
diff --git a/libre/java7-openjdk/PKGBUILD b/libre/java7-openjdk/PKGBUILD
index 62dc1932b..fb4f665a4 100644
--- a/libre/java7-openjdk/PKGBUILD
+++ b/libre/java7-openjdk/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 220813 2014-08-30 09:05:41Z guillaume $
+# $Id: PKGBUILD 221783 2014-09-15 20:19:56Z guillaume $
# Maintainer (Arch): Andreas Radke <andyrtr@archlinux.org>
# Maintainer (Arch): Guillaume ALAUX <guillaume@archlinux.org>
# Contributor (Arch): Jan de Groot <jgc@archlinux.org>
@@ -15,7 +15,7 @@ _JDK_UPDATE_VERSION=65
_bootstrap=0 # 0/1 for quick build or full bootstrap
pkgver=${_java_ver}.u${_JDK_UPDATE_VERSION}_${_icedtea_ver}
-pkgrel=1.parabola1
+pkgrel=2.parabola1
arch=('i686' 'x86_64')
url='http://icedtea.classpath.org'
license=('custom')
diff --git a/libre/java7-openjdk/jdk7-openjdk.install b/libre/java7-openjdk/jdk7-openjdk.install
index 8a985b606..c8503412a 100644
--- a/libre/java7-openjdk/jdk7-openjdk.install
+++ b/libre/java7-openjdk/jdk7-openjdk.install
@@ -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/java7-openjdk/jre7-openjdk-headless.install b/libre/java7-openjdk/jre7-openjdk-headless.install
index 48b79e8b0..dae6648f0 100644
--- a/libre/java7-openjdk/jre7-openjdk-headless.install
+++ b/libre/java7-openjdk/jre7-openjdk-headless.install
@@ -15,7 +15,7 @@ post_install() {
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 @@ 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
}