Subject: [alpine-aports] [PATCH 1/2] testing/openjdk8: install profile to /etc/profile.d

From: Sören Tempel <[email-masked]>
Date: Fri, 2 Oct 2015 18:52:22 +0200

---
 testing/openjdk8/APKBUILD | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

diff --git a/testing/openjdk8/APKBUILD b/testing/openjdk8/APKBUILD
index d7400db..35ca206 100644
--- a/testing/openjdk8/APKBUILD
+++ b/testing/openjdk8/APKBUILD
@@ -1,3 +1,4 @@
+# Contributor: Sören Tempel <[email-masked]>
 # Contributor: Timo Teras <[email-masked]>
 # Maintainer: Timo Teras <[email-masked]>
 pkgname=openjdk8
@@ -5,7 +6,7 @@ _java_ver=8
 _jdk_update=66
 _jdk_build=02
 pkgver=$_java_ver.$_jdk_update.$_jdk_build
-pkgrel=1
+pkgrel=2
 pkgdesc="Sun OpenJDK 8"
 url="http://openjdk.java.net"
 arch="x86_64 x86"
@@ -145,6 +146,13 @@ package() {
 		| xargs chmod go+r
 
 	pax_mark_vm "$pkgdir"/$INSTALL_BASE
+
+	# install profile file in /etc/profile.d
+	mkdir -p "$pkgdir"/etc/profile.d
+	cat > "$pkgdir/etc/profile.d/$pkgname.sh" <<EOF
+export JAVA_HOME="\${JAVA_HOME:-$INSTALL_BASE/jre}"
+export PATH="\$PATH:\$JAVA_HOME/bin:$INSTALL_BASE/bin"
+EOF
 }
 
 jrelib() {
-- 
2.6.0

---
Unsubscribe:  [email-masked]
Help:         [email-masked]
---

---

From: Sören Tempel <[email-masked]>
Date: Fri, 2 Oct 2015 18:52:23 +0200

---
 main/openjdk7/APKBUILD | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

diff --git a/main/openjdk7/APKBUILD b/main/openjdk7/APKBUILD
index 0325f10..d5fb04f 100644
--- a/main/openjdk7/APKBUILD
+++ b/main/openjdk7/APKBUILD
@@ -1,3 +1,4 @@
+# Contributor: Sören Tempel <[email-masked]>
 # Contributor: Timo Teras <[email-masked]>
 # Maintainer: Timo Teras <[email-masked]>
 pkgname=openjdk7
@@ -5,7 +6,7 @@ _icedteaver=2.6.1
 # pkgver is <JDK version>.<JDK update>
 # check icedtea JDK when updating
 pkgver=7.85.$_icedteaver
-pkgrel=0
+pkgrel=1
 pkgdesc="Sun OpenJDK 7 via IcedTea"
 url="http://icedtea.classpath.org/"
 arch="all"
@@ -168,6 +169,13 @@ package() {
 
 	# pax mark again (due to fakeroot xattr handling bug)
 	$_builddir/pax-mark-vm "$pkgdir"/$INSTALL_BASE
+
+	# install profile file in /etc/profile.d
+	mkdir -p "$pkgdir"/etc/profile.d
+	cat > "$pkgdir/etc/profile.d/$pkgname.sh" <<EOF
+export JAVA_HOME="\${JAVA_HOME:-$INSTALL_BASE/jre}"
+export PATH="\$PATH:\$JAVA_HOME/bin:$INSTALL_BASE/bin"
+EOF
 }
 
 jrelib() {
-- 
2.6.0

---