Hello community, here is the log from the commit of package aaa_base for openSUSE:Factory checked in at 2012-01-25 15:00:53 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/aaa_base (Old) and /work/SRC/openSUSE:Factory/.aaa_base.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "aaa_base", Maintainer is "r...@suse.com" Changes: -------- --- /work/SRC/openSUSE:Factory/aaa_base/aaa_base.changes 2012-01-19 09:40:43.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.aaa_base.new/aaa_base.changes 2012-01-25 15:00:54.000000000 +0100 @@ -1,0 +2,5 @@ +Fri Jan 20 10:19:45 UTC 2012 - lnus...@suse.de + +- Make alljava.(c)sh friendly to third-party JVMs (bnc#722252) + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ aaa_base.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/aaa_base/files/etc/profile.d/alljava.csh new/aaa_base/files/etc/profile.d/alljava.csh --- old/aaa_base/files/etc/profile.d/alljava.csh 2012-01-17 14:33:54.000000000 +0100 +++ new/aaa_base/files/etc/profile.d/alljava.csh 2012-01-20 11:18:10.000000000 +0100 @@ -1,46 +1,41 @@ # # /etc/profile.d/alljava.csh # -# send feedback to http://www.suse.de/feedback +# send feedback to http://bugs.opensuse.org # # This script sets some environment variables for default java. -# Affected variables: PATH, JAVA_BINDIR, JAVA_HOME, JRE_HOME, +# Affected variables: JAVA_BINDIR, JAVA_HOME, JRE_HOME, # JDK_HOME, SDK_HOME # -set __libdir=lib -if ( -l /usr/lib64/jvm/java || -l /usr/lib64/jvm/jre ) then - set __libdir=lib64 -endif - -if ( -x /usr/$__libdir/jvm/java/bin/java || -x /usr/$__libdir/jvm/java/bin/jre ) then - setenv JAVA_BINDIR /usr/$__libdir/jvm/java/bin - setenv JAVA_ROOT /usr/$__libdir/jvm/java - setenv JAVA_HOME /usr/$__libdir/jvm/java - setenv JRE_HOME /usr/$__libdir/jvm/jre - unsetenv JDK_HOME - unsetenv SDK_HOME - if ( -x /usr/$__libdir/jvm/java/bin/javac ) then - # it is development kit - if ( -x /usr/$__libdir/jvm/java/bin/jre ) then - setenv JDK_HOME /usr/$__libdir/jvm/java - else - setenv JDK_HOME /usr/$__libdir/jvm/java - setenv SDK_HOME /usr/$__libdir/jvm/java - endif - endif -else - if ( -x /usr/$__libdir/jvm/jre/bin/java ) then - # it is IBMJava2-JRE or SunJava2-JRE - setenv PATH ${PATH}:/usr/$__libdir/jvm/jre/bin - setenv JAVA_BINDIR /usr/$__libdir/jvm/jre/bin - setenv JAVA_ROOT /usr/$__libdir/jvm/jre - setenv JAVA_HOME /usr/$__libdir/jvm/jre - setenv JRE_HOME /usr/$__libdir/jvm/jre - unsetenv JDK_HOME - unsetenv SDK_HOME - endif -endif +foreach JDIR ( "/usr/lib64/jvm" "/usr/lib/jvm" "/usr/java/latest" "/usr/java" ) -unset __libdir + if ( ! -d $JDIR ) continue + + foreach JPATH ( $JDIR $JDIR/java `ls -I 'java' -I 'jre' -d $JDIR/*` $JDIR/jre ) + + if ( ! -x $JPATH/bin/java ) continue + + setenv JAVA_BINDIR $JPATH/bin + setenv JAVA_ROOT $JPATH + setenv JAVA_HOME $JPATH + unset JDK_HOME + unset SDK_HOME + + switch ( $JPATH ) + case *jre*: + setenv JRE_HOME $JPATH + breaksw + default: + setenv JRE_HOME $JPATH/jre + # it is development kit=20 + if ( -x $JPATH/bin/javac ) then + setenv JDK_HOME $JPATH + setenv SDK_HOME $JPATH + endif + endsw + end + unset JPATH +end +unset JDIR diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/aaa_base/files/etc/profile.d/alljava.sh new/aaa_base/files/etc/profile.d/alljava.sh --- old/aaa_base/files/etc/profile.d/alljava.sh 2012-01-17 14:33:54.000000000 +0100 +++ new/aaa_base/files/etc/profile.d/alljava.sh 2012-01-20 11:18:10.000000000 +0100 @@ -1,46 +1,49 @@ # # /etc/profile.d/alljava.sh # -# send feedback to http://www.suse.de/feedback +# send feedback to http://bugs.opensuse.org # # This script sets some environment variables for default java. -# Affected variables: PATH, JAVA_BINDIR, JAVA_HOME, JRE_HOME, +# Affected variables: JAVA_BINDIR, JAVA_HOME, JRE_HOME, # JDK_HOME, SDK_HOME # -__libdir=lib -if [ -x /usr/lib64/jvm/java ] || [ -x /usr/lib64/jvm/jre ] ; then - __libdir=lib64 -fi - -if [ -x /usr/$__libdir/jvm/java/bin/java ] || [ -x /usr/$__libdir/jvm/java/bin/jre ] ; then - export JAVA_BINDIR=/usr/$__libdir/jvm/java/bin - export JAVA_ROOT=/usr/$__libdir/jvm/java - export JAVA_HOME=/usr/$__libdir/jvm/java - export JRE_HOME=/usr/$__libdir/jvm/jre - unset JDK_HOME - unset SDK_HOME - if [ -x /usr/$__libdir/jvm/java/bin/javac ] ; then - # it is development kit - if [ -x /usr/$__libdir/jvm/java/bin/jre ] ; then - export JDK_HOME=/usr/$__libdir/jvm/java - else - export JDK_HOME=/usr/$__libdir/jvm/java - export SDK_HOME=/usr/$__libdir/jvm/java +for JDIR in /usr/lib64/jvm /usr/lib/jvm /usr/java/latest /usr/java; do + + if ! test -d $JPATH; then + continue fi - fi -else - if [ -x /usr/$__libdir/jvm/jre/bin/java ] ; then - # it is IBMJava2-JRE or SunJava2-JRE - export PATH=$PATH:/usr/$__libdir/jvm/jre/bin - export JAVA_BINDIR=/usr/$__libdir/jvm/jre/bin - export JAVA_ROOT=/usr/$__libdir/jvm/jre - export JAVA_HOME=/usr/$__libdir/jvm/jre - export JRE_HOME=/usr/$__libdir/jvm/jre - unset JDK_HOME - unset SDK_HOME - fi -fi -unset __libdir + for JPATH in $JDIR $JDIR/java `ls -I 'java' -I 'jre' -d $JDIR/* 2>/dev/null` $JDIR/jre; do + + if ! test -x $JPATH/bin/java ; then + continue + fi + + export JAVA_BINDIR=3D$JPATH/bin + export JAVA_ROOT=3D$JPATH + export JAVA_HOME=3D$JPATH + unset JDK_HOME + unset SDK_HOME + + case "$JPATH" in + *jre*) + export JRE_HOME=3D$JPATH + ;; + + *) + export JRE_HOME=3D$JPATH/jre + # it is development kit + if [ -x $JPATH/bin/javac ] ; then + export JDK_HOME=3D$JPATH + export SDK_HOME=3D$JPATH + fi + ;; + esac + + done + unset JPATH + +done +unset JDIR -- To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org For additional commands, e-mail: opensuse-commit+h...@opensuse.org
