Author: fourmond Date: 2011-01-13 22:00:54 +0000 (Thu, 13 Jan 2011) New Revision: 13200
Modified: trunk/java-wrappers/debian/changelog trunk/java-wrappers/java-wrappers.sh trunk/java-wrappers/jvm-list.sh Log: [java-wrappers] Building upon Gabriele's patch for a proper fix Modified: trunk/java-wrappers/debian/changelog =================================================================== --- trunk/java-wrappers/debian/changelog 2011-01-12 21:21:07 UTC (rev 13199) +++ trunk/java-wrappers/debian/changelog 2011-01-13 22:00:54 UTC (rev 13200) @@ -1,9 +1,13 @@ -java-wrappers (0.1.17) UNRELEASED; urgency=low +java-wrappers (0.1.17) experimental; urgency=low - * REMOVEME toward java-alternatives integration (will close #609731). + [ Gabriele Giacone ] + * First step toward java-alternatives integration - -- Gabriele Giacone <[email protected]> Wed, 12 Jan 2011 22:18:19 +0100 + [ Vincent Fourmond ] + * Final step (closes: #609731); thanks Gabriele for the first ;-)... + -- Vincent Fourmond <[email protected]> Thu, 13 Jan 2011 22:59:38 +0100 + java-wrappers (0.1.16) unstable; urgency=low * Adding default as a valid jre choice, and make it the default for Modified: trunk/java-wrappers/java-wrappers.sh =================================================================== --- trunk/java-wrappers/java-wrappers.sh 2011-01-12 21:21:07 UTC (rev 13199) +++ trunk/java-wrappers/java-wrappers.sh 2011-01-13 22:00:54 UTC (rev 13200) @@ -117,13 +117,21 @@ if [ -z "$DIRS" ]; then DIRS=$all_runtimes fi + # First, we check if __jvm_alt is within the possible choices: + if echo "$DIRS" | fgrep "$__jvm_alt" > /dev/null ; then + JAVA_HOME="$__jvm_alt" + java_debug "Picking up the JVM designated by the alternatives system: " + java_debug " JAVA_HOME = '$JAVA_HOME'" + else + # And pick up the first one that works reasonably - for dir in $DIRS; do - if [ -x $dir/bin/java ]; then - JAVA_HOME=$dir - break; - fi - done + for dir in $DIRS; do + if [ -x $dir/bin/java ]; then + JAVA_HOME=$dir + break; + fi + done + fi else java_debug "Using provided JAVA_HOME = '$JAVA_HOME'" fi Modified: trunk/java-wrappers/jvm-list.sh =================================================================== --- trunk/java-wrappers/jvm-list.sh 2011-01-12 21:21:07 UTC (rev 13199) +++ trunk/java-wrappers/jvm-list.sh 2011-01-13 22:00:54 UTC (rev 13200) @@ -66,6 +66,6 @@ __jvm_alt=$(readlink /etc/alternatives/java|sed -n 's/\(\/usr\/lib\/jvm\/[^\/]*\)\/.*/\1/p') # All JVMs -__jvm_all="$__jvm_alt $__jvm_default /usr/lib/jvm/* $__jvm_ibm $__jvm_sun4 $__jvm_sablevm $__jvm_kaffe" +__jvm_all="$__jvm_default /usr/lib/jvm/* $__jvm_ibm $__jvm_sun4 $__jvm_sablevm $__jvm_kaffe" # Probably here should come a few meaningful global aliases. _______________________________________________ pkg-java-commits mailing list [email protected] http://lists.alioth.debian.org/mailman/listinfo/pkg-java-commits
