Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=3110f99d789bfdfac97d2abb935da7808b6e1f97
commit 3110f99d789bfdfac97d2abb935da7808b6e1f97 Author: DeX77 <de...@frugalware.org> Date: Thu Nov 7 14:20:05 2013 +0100 openjdk-7-8-x86_64 * release bump * fix stupid openjre.sh bug diff --git a/source/devel-extra/openjdk/FrugalBuild b/source/devel-extra/openjdk/FrugalBuild index a5b7789..d9f344f 100644 --- a/source/devel-extra/openjdk/FrugalBuild +++ b/source/devel-extra/openjdk/FrugalBuild @@ -8,7 +8,7 @@ _updatever=u7 pkgver=7 icedteaver=2.3.3 javaver="$pkgver-openjdk" -pkgrel=7 +pkgrel=8 pkgdesc="Open-source Java Development Kit implementation." url="http://openjdk.java.net/"; depends=('libx11') diff --git a/source/devel-extra/openjdk/openjre.sh b/source/devel-extra/openjdk/openjre.sh index d75bc85b..aba9b3e 100755 --- a/source/devel-extra/openjdk/openjre.sh +++ b/source/devel-extra/openjdk/openjre.sh @@ -1,11 +1,15 @@ -#!/bin/sh +export OPENJREDIR=/usr/lib/jvm/java-7-openjdk/jre +export MANPATH=$MANPATH:$OPENJREDIR/man +export CLASSPATH=$CLASSPATH:$OPENJREDIR/lib - KEYSTORE="/usr/lib/jvm/java-7-openjdk/jre/lib/security/cacerts" - - for i in `find /etc/ssl/certs ! -type d` - do - filename=$(basename "$i") - aliasname="${filename%.*}" - /usr/lib/jvm/java-7-openjdk/jre/bin/keytool -import -keystore $KEYSTORE -storepass changeit -noprompt -file $i -alias $aliasname - done - +# if you put "java=foo" (where foo != openjdk) to /etc/sysconfig/java, +# then this script won't touch the JAVA_HOME variable +[ -e /etc/sysconfig/java ] && source /etc/sysconfig/java +if [ -z "$java" -o "$java" == "openjdk" ]; then + if [ ! -f /etc/profile.d/openjdk.sh ]; then + export JAVA_HOME=$OPENJREDIR + fi + export PATH=$OPENJREDIR/bin:$PATH +else + export PATH=$PATH:$OPENJREDIR/bin +fi _______________________________________________ Frugalware-git mailing list Frugalware-git@frugalware.org http://frugalware.org/mailman/listinfo/frugalware-git
