[arch-commits] Commit in java-meta/trunk (bin_archlinux-java bin_archlinux-java_tests)

[Guillaume Alaux]

    Date: Tuesday, July 22, 2014 @ 17:13:36
  Author: guillaume
Revision: 217730

Fix tests

Modified:
  java-meta/trunk/bin_archlinux-java
  java-meta/trunk/bin_archlinux-java_tests

--------------------------+
 bin_archlinux-java       |   28 ++++++++++++++++------------
 bin_archlinux-java_tests |    6 +++---
 2 files changed, 19 insertions(+), 15 deletions(-)

Modified: bin_archlinux-java
===================================================================
--- bin_archlinux-java	2014-07-22 13:04:37 UTC (rev 217729)
+++ bin_archlinux-java	2014-07-22 15:13:36 UTC (rev 217730)
@@ -6,6 +6,7 @@
 JVM_DIR=/usr/lib/jvm
 DEFAULT_NAME=java-default-runtime
 DEFAULT_PATH=${JVM_DIR}/${DEFAULT_NAME}
+BIN_PATH=/usr/bin
 
 
 # Utility functions
@@ -58,11 +59,19 @@
   check_root
   echo "Setting Java environment '$1' as default"
   ln -sf $1 ${DEFAULT_PATH}
+  find ${DEFAULT_PATH}/bin ! -type d -perm /a=x \
+    | while read bpath; do
+      ln -sf ${bpath} ${BIN_PATH}/$(basename ${bpath})
+    done
 }
 
 unset_default() {
   check_root
   echo "Unsetting $(get_default_java) as default"
+  find ${DEFAULT_PATH}/bin ! -type d -perm /a=x \
+    | while read bpath; do
+      unlink ${BIN_PATH}/$(basename ${bpath})
+    done
   unlink ${DEFAULT_PATH} 2>/dev/null
 }
 
@@ -136,18 +145,13 @@
     if [ "x${default}" != "x" ]; then
       unset_default
     fi
-    installed=($(get_installed_javas))
-    if [ ${#installed[@]} -eq 0 ]; then
-      echo 'No valid Java environment found'
-    else
-      to_check=('java-7-openjdk' 'java-7-openjdk/jre' ${installed})
-      for java in ${to_check[@]}; do
-        if is_java_valid ${java}; then
-          set_default_to ${java}
-          exit 0
-        fi
-      done
-    fi
+    to_check=('java-7-openjdk' 'java-7-openjdk/jre' $(get_installed_javas))
+    for java in ${to_check[@]}; do
+      if is_java_valid ${java}; then
+        set_default_to ${java}
+        exit 0
+      fi
+    done
   fi
 }
 

Modified: bin_archlinux-java_tests
===================================================================
--- bin_archlinux-java_tests	2014-07-22 13:04:37 UTC (rev 217729)
+++ bin_archlinux-java_tests	2014-07-22 15:13:36 UTC (rev 217730)
@@ -104,10 +104,10 @@
 
 test_set_default_to() {
   create_valid_jre_env "${JAVA_NAME}/jre"
-  output=$(set_default_to "${JAVA_NAME}")
+  output=$(set_default_to "${JAVA_NAME}/jre")
   assertEquals 'Success does not yield 0' 0 $?
-  assertEquals 'Wrong message' "Setting Java environment '${JAVA_NAME}' as default" "${output}"
-  assertDefaultSetTo "${JAVA_NAME}"
+  assertEquals 'Wrong message' "Setting Java environment '${JAVA_NAME}/jre' as default" "${output}"
+  assertDefaultSetTo "${JAVA_NAME}/jre"
 }
 
 tests_unset_default() {