[arch-commits] Commit in java-meta/trunk (3 files)
Guillaume Alaux
guillaume at archlinux.org
Fri Jul 25 21:01:16 UTC 2014
Date: Friday, July 25, 2014 @ 23:01:16
Author: guillaume
Revision: 218174
Remove some 'echo'
Modified:
java-meta/trunk/PKGBUILD
java-meta/trunk/bin_archlinux-java
java-meta/trunk/bin_archlinux-java_tests
--------------------------+
PKGBUILD | 4 +-
bin_archlinux-java | 57 ++++++++++++++++++------------------
bin_archlinux-java_tests | 71 ++++++++++++++++-----------------------------
3 files changed, 57 insertions(+), 75 deletions(-)
Modified: PKGBUILD
===================================================================
--- PKGBUILD 2014-07-25 17:50:52 UTC (rev 218173)
+++ PKGBUILD 2014-07-25 21:01:16 UTC (rev 218174)
@@ -20,8 +20,8 @@
sha256sums=('9f0032e47705ce55a615ab3b942720b8447f490d1ff430b214038b81c3019ac2'
'8dbafa311f34d23c5bbef71fa942b97b224ebeb330b36195f22a1836285bbb83'
- 'af9539b5bfb28ec5ace67547a8e4ba94e1aa2fe09b0fcd6d779e07c19ba4a9b2'
- 'e91b0ca5fe3fab8720822d930f2f17635104353368674e72e852124bb11112e9'
+ 'd54f54e79ee8104783a12fa7e55f9826f80c26142b1d89a34ffe2529ed78d962'
+ '90c1ca2f32aedf684048e1c072e03eff6b919a10b9b0e83b182186e7572d11c6'
'622927af9ec374140a878993936f7fdd4206fe069dddfcefc6d4e15fa6d67f39'
'65a313a76fd5cc1c58c9e19fbc80fc0e418a4cbfbd46d54b35ed5b6e0025d4ee')
Modified: bin_archlinux-java
===================================================================
--- bin_archlinux-java 2014-07-25 17:50:52 UTC (rev 218173)
+++ bin_archlinux-java 2014-07-25 21:01:16 UTC (rev 218174)
@@ -1,13 +1,10 @@
#! /bin/bash
-# TODO
-# Add info about license here
-# add message when setting JRE whereas JDK exists
-# ensure links do not output errors (???)
+# Arch Linux helper script to set/unset/check/fix the enabled Java environment
+# This program may be freely redistributed under the terms of the GNU General Public License
+#
+# Author: Guillaume ALAUX <guillaume at archlinux.org>
-# Arch Linux helper script to set/unset/check the enabled Java environment
-# See '-h' or '--help' for usage
-
JVM_DIR=/usr/lib/jvm
DEFAULT_NAME=java-default-runtime
DEFAULT_PATH=${JVM_DIR}/${DEFAULT_NAME}
@@ -60,15 +57,25 @@
test "x$1" != "x${DEFAULT_NAME}" && test -x ${JVM_DIR}/$1/bin/java
}
+set_bin_links() {
+ find -L ${BIN_PATH} -samefile ${WRAPPER_PATH} \
+ | while read lpath; do
+ if [ ! -x "${DEFAULT_PATH}/bin/$(basename ${lpath})" ]; then
+ unlink ${lpath} 2>/dev/null
+ fi
+ done
+
+ find ${DEFAULT_PATH}/bin ! -type d -perm /a=x \
+ | while read bpath; do
+ ln -sf ${WRAPPER_PATH} ${BIN_PATH}/$(basename ${bpath}) > /dev/null 2>&1
+ done
+}
+
# $1: Java environment name to set as default
set_default_to() {
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 ${WRAPPER_PATH} ${BIN_PATH}/$(basename ${bpath})
- done
+ set_bin_links
parent_dir=$(dirname $1)
if is_java_valid ${parent_dir}; then
echo "Warning: '${parent_dir}' looks like a valid JDK whereas you are only setting '$1' as default"
@@ -78,10 +85,9 @@
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})
+ unlink ${BIN_PATH}/$(basename ${bpath}) 2>/dev/null
done
unlink ${DEFAULT_PATH} 2>/dev/null
}
@@ -111,15 +117,11 @@
# $1: Java environment name to try to set
try_set_default() {
default_java=$(get_default_java)
- if is_java_valid ${default_java}; then
+ if ! is_java_valid ${default_java} || [ "x${default_java}" = "x$1/jre" ]; then
+ force_set_default $1
+ else
echo "The default Java environment is already set to ${default_java}"
echo "Please use 'archlinux-java --force-set $1' if you want to force it"
- else
- if is_java_valid $1; then
- set_default_to $1
- else
- force_set_default $1
- fi
fi
}
@@ -142,9 +144,8 @@
default=$(get_default_java)
if [ "x${default}" != "x" -a "x${default}" = "x$1" ]; then
unset_default
- echo 'No Java environment is set as default any more'
else
- echo "'$1' is not set as Java environment default"
+ echo "'$1' is not set as default Java environment"
fi
}
@@ -154,8 +155,6 @@
if is_java_valid $(dirname ${default}); then
unset_default
set_default_to $(dirname ${default})
- else
- echo "Current default Java environment is valid: '${default}'"
fi
else
if [ "x${default}" != "x" ]; then
@@ -167,10 +166,12 @@
set_default_to ${java}
fi
done
- if ! is_java_valid $(get_default_java); then
- echo 'No valid Java environment found'
- fi
fi
+ if is_java_valid $(get_default_java); then
+ set_bin_links
+ else
+ echo 'No valid Java environment found'
+ fi
}
usage() {
Modified: bin_archlinux-java_tests
===================================================================
--- bin_archlinux-java_tests 2014-07-25 17:50:52 UTC (rev 218173)
+++ bin_archlinux-java_tests 2014-07-25 21:01:16 UTC (rev 218174)
@@ -33,6 +33,8 @@
mkdir -p ${BIN_PATH}
WRAPPER_PATH=${test_dir}${INIT_WRAPPER_PATH}
mkdir -p $(dirname ${WRAPPER_PATH})
+ touch ${WRAPPER_PATH}
+ chmod +x ${WRAPPER_PATH}
}
tearDown() {
@@ -119,9 +121,8 @@
test_set_default_to() {
create_valid_jre_env "${JAVA_NAME}/jre"
- output=$(set_default_to "${JAVA_NAME}/jre")
+ set_default_to "${JAVA_NAME}/jre"
assertEquals 'Success does not yield 0' 0 $?
- assertEquals 'Wrong message' "Setting Java environment '${JAVA_NAME}/jre' as default" "${output}"
assertDefaultSetTo "${JAVA_NAME}/jre"
}
@@ -128,8 +129,7 @@
test_set_default_to_jre_but_jdk() {
create_valid_jdk_env "${JAVA_NAME}"
output=$(set_default_to "${JAVA_NAME}/jre")
- mess="Setting Java environment '${JAVA_NAME}/jre' as default"
- mess+="\nWarning: '${JAVA_NAME}' looks like a valid JDK"
+ mess="Warning: '${JAVA_NAME}' looks like a valid JDK"
mess+=" whereas you are only setting '${JAVA_NAME}/jre' as default"
mess+="\nFix this with 'archlinux-java --force-set ${JAVA_NAME}'"
expected=$(echo -e ${mess})
@@ -140,9 +140,8 @@
tests_unset_default() {
create_valid_jre_env "${JAVA_NAME}/jre"
set_default_for_test "${JAVA_NAME}/jre"
- output=$(unset_default)
+ unset_default
assertEquals 'Success does not yield 0' 0 $?
- assertEquals 'Wrong message' "Unsetting ${JAVA_NAME}/jre as default" "${output}"
assertTrue 'Link was not unset' "[ ! -e ${DEFAULT_PATH} ]"
}
@@ -176,8 +175,7 @@
test_try_set_default_no_default() {
create_valid_jre_env "${JAVA_NAME}/jre"
- output=$(try_set_default "${JAVA_NAME}/jre")
- assertEquals 'Wrong message' "Setting Java environment '${JAVA_NAME}/jre' as default" "${output}"
+ try_set_default "${JAVA_NAME}/jre"
assertDefaultSetTo "${JAVA_NAME}/jre"
}
@@ -195,15 +193,20 @@
test_try_set_default_default_invalid() {
create_valid_jre_env "${JAVA_NAME}/jre"
set_default_for_test "non_existing"
- output=$(try_set_default "${JAVA_NAME}/jre")
- assertEquals 'Wrong message' "Setting Java environment '${JAVA_NAME}/jre' as default" "${output}"
+ try_set_default "${JAVA_NAME}/jre"
assertDefaultSetTo "${JAVA_NAME}/jre"
}
+test_try_set_default_jdk_where_jre_is_default() {
+ create_valid_jdk_env "${JAVA_NAME}"
+ set_default_for_test "${JAVA_NAME}/jre"
+ try_set_default "${JAVA_NAME}"
+ assertDefaultSetTo "${JAVA_NAME}"
+}
+
test_force_set_default_no_default() {
create_valid_jre_env "${JAVA_NAME}/jre"
- output=$(force_set_default "${JAVA_NAME}/jre")
- assertEquals 'Wrong message' "Setting Java environment '${JAVA_NAME}/jre' as default" "${output}"
+ force_set_default "${JAVA_NAME}/jre"
assertDefaultSetTo "${JAVA_NAME}/jre"
}
@@ -212,11 +215,7 @@
set_default_for_test "${JAVA_NAME}/jre"
JAVA_NAME_2="$(get_rand_str)"
create_valid_jre_env "${JAVA_NAME_2}/jre"
- output=$(force_set_default "${JAVA_NAME_2}/jre")
- mess="Unsetting ${JAVA_NAME}/jre as default"
- mess+="\nSetting Java environment '${JAVA_NAME_2}/jre' as default"
- expected=$(echo -e "${mess}")
- assertEquals 'Wrong message' "${expected}" "${output}"
+ force_set_default "${JAVA_NAME_2}/jre"
assertDefaultSetTo "${JAVA_NAME_2}/jre"
}
@@ -232,7 +231,7 @@
test_try_unset_default_no_default() {
create_valid_jdk_env "${JAVA_NAME}"
output=$(try_unset_default "${JAVA_NAME}")
- expected="'${JAVA_NAME}' is not set as Java environment default"
+ expected="'${JAVA_NAME}' is not set as default Java environment"
assertEquals 'Wrong message' "${expected}" "${output}"
assertDefaultNotSet
}
@@ -241,7 +240,7 @@
create_valid_jre_env "${JAVA_NAME}/jre"
set_default_for_test "${JAVA_NAME}/jre"
output=$(try_unset_default "other_java")
- expected="'other_java' is not set as Java environment default"
+ expected="'other_java' is not set as default Java environment"
assertEquals 'Wrong message' "${expected}" "${output}"
assertDefaultSetTo "${JAVA_NAME}/jre"
}
@@ -249,11 +248,7 @@
test_try_unset_default_default_is_target() {
create_valid_jre_env "${JAVA_NAME}/jre"
set_default_for_test "${JAVA_NAME}/jre"
- output=$(try_unset_default "${JAVA_NAME}/jre")
- mess="Unsetting ${JAVA_NAME}/jre as default"
- mess+="\nNo Java environment is set as default any more"
- expected=$(echo -e "${mess}")
- assertEquals 'Wrong message' "${expected}" "${output}"
+ try_unset_default "${JAVA_NAME}/jre"
assertDefaultNotSet
}
@@ -260,41 +255,31 @@
test_fix_default_default_valid() {
create_valid_jre_env "${JAVA_NAME}/jre"
set_default_for_test "${JAVA_NAME}/jre"
- output=$(fix_default)
- expected="Current default Java environment is valid: '${JAVA_NAME}/jre'"
- assertEquals 'Wrong message' "${expected}" "${output}"
+ fix_default
assertDefaultSetTo "${JAVA_NAME}/jre"
}
test_fix_default_no_default() {
create_valid_jre_env "${JAVA_NAME}/jre"
- output=$(fix_default)
- expected="Setting Java environment '${JAVA_NAME}/jre' as default"
- assertEquals 'Wrong message' "${expected}" "${output}"
+ fix_default
assertDefaultSetTo "${JAVA_NAME}/jre"
}
test_fix_default_default_invalid_openjdk7_jdk_installed() {
create_valid_jdk_env "java-7-openjdk"
- output=$(fix_default)
- expected="Setting Java environment 'java-7-openjdk' as default"
- assertEquals 'Wrong message' "${expected}" "${output}"
- #assertDefaultSetTo "java-7-openjdk"
+ fix_default
+ assertDefaultSetTo "java-7-openjdk"
}
test_fix_default_default_invalid_openjdk7_jre_installed() {
create_valid_jre_env "java-7-openjdk/jre"
- output=$(fix_default)
- expected="Setting Java environment 'java-7-openjdk/jre' as default"
- assertEquals 'Wrong message' "${expected}" "${output}"
+ fix_default
assertDefaultSetTo "java-7-openjdk/jre"
}
test_fix_default_default_invalid_random_java_installed() {
create_valid_jdk_env "${JAVA_NAME}"
- output=$(fix_default)
- expected="Setting Java environment '${JAVA_NAME}' as default"
- assertEquals 'Wrong message' "${expected}" "${output}"
+ fix_default
assertDefaultSetTo "${JAVA_NAME}"
}
@@ -306,11 +291,7 @@
test_fix_default_jre_but_jdk_exists() {
create_valid_jdk_env "${JAVA_NAME}"
set_default_for_test "${JAVA_NAME}/jre"
- output=$(fix_default)
- mess="Unsetting ${JAVA_NAME}/jre as default"
- mess+="\nSetting Java environment '${JAVA_NAME}' as default"
- expected=$(echo -e ${mess})
- assertEquals 'Wrong message' "${expected}" "${output}"
+ fix_default
assertDefaultSetTo "${JAVA_NAME}"
}
More information about the arch-commits
mailing list