[arch-commits] Commit in java-common/trunk (3 files)

[Guillaume Alaux]

    Date: Tuesday, August 26, 2014 @ 21:06:35
  Author: guillaume
Revision: 220677

Fix FS#41662 archlinux-java wrong status for JRE only

Modified:
  java-common/trunk/PKGBUILD
  java-common/trunk/bin_archlinux-java
  java-common/trunk/test_archlinux-java

---------------------+
 PKGBUILD            |    6 +++---
 bin_archlinux-java  |    4 +++-
 test_archlinux-java |    9 +++++++++
 3 files changed, 15 insertions(+), 4 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2014-08-26 18:05:05 UTC (rev 220676)
+++ PKGBUILD	2014-08-26 19:06:35 UTC (rev 220677)
@@ -1,7 +1,7 @@
 # Maintainer: Guillaume ALAUX <guillaume at archlinux.org>
 pkgname=java-common
 pkgver=1
-pkgrel=5
+pkgrel=6
 pkgdesc='Common files for Java Environments'
 arch=('any')
 url='www.archlinux.org'
@@ -21,8 +21,8 @@
 
 sha256sums=('073ebe73e05346c03c29d02c73cca38f6a4fccc9f3ab2026760f1cd29791fabb'
             '458eced6d2846805fbc18ca2ba717bf5f0556cc93a442b485c81fe12a4f6e5b6'
-            'a44e4842b7c659f4f6628745090d2dde3874e225317043493d5996353c7b8b74'
-            '0dd93c9779c617af061b25f5e3d23cacb741d8d757f533312c3af976661e8cbc'
+            'd8753baf34ac2454edd7ba4d4f3ecf52aba02615a8ebc0f35ddf59ea83c11cd2'
+            'edf0f8eeb17720276026777b5b2ecb8629593e9f0a3af6def66cc9a77e31810a'
             '622927af9ec374140a878993936f7fdd4206fe069dddfcefc6d4e15fa6d67f39'
             '65a313a76fd5cc1c58c9e19fbc80fc0e418a4cbfbd46d54b35ed5b6e0025d4ee')
 

Modified: bin_archlinux-java
===================================================================
--- bin_archlinux-java	2014-08-26 18:05:05 UTC (rev 220676)
+++ bin_archlinux-java	2014-08-26 19:06:35 UTC (rev 220677)
@@ -91,7 +91,9 @@
     default_java=$(get_default_java)
     echo 'Available Java environments:'
     for java in ${installed_java[@]}; do
-      if [ ${java} = "${default_java}" ]; then
+      if [ "${java}/jre" = "${default_java}" ]; then
+        echo -e "  ${java} (${java}/jre default)"
+      elif [ ${java} = "${default_java}" ]; then
         echo -e "  ${java} (default)"
       else
         echo "  ${java}"

Modified: test_archlinux-java
===================================================================
--- test_archlinux-java	2014-08-26 18:05:05 UTC (rev 220676)
+++ test_archlinux-java	2014-08-26 19:06:35 UTC (rev 220677)
@@ -123,6 +123,15 @@
   assertEquals 'Wrong status output' 'No compatible Java environment installed' "$(do_status)"
 }
 
+test_do_status_jre_but_jdk_exists() {
+  create_valid_jdk_env "${JAVA_NAME}"
+  set_default_for_test "${JAVA_NAME}/jre"
+  mess="Available Java environments:"
+  mess+="\n  ${JAVA_NAME} (${JAVA_NAME}/jre default)"
+  expected=$(echo -e "${mess}")
+  assertEquals 'Wrong status output' "${expected}" "$(do_status)"
+}
+
 # do_get
 
 test_do_get_with_default() {