jeans/LibreELEC.tv
jeans/LibreELEC.tv
1
0
Fork 0
mirror of https://github.com/LibreELEC/LibreELEC.tv.git synced 2025-07-28 05:06:43 +00:00
Code Issues Packages Projects Releases Wiki Activity

config/functions: fix bash-4.4 issue, and possible undesirable behaviour with empty 2nd param

Browse Source
This commit is contained in:
MilhouseVH 2017-08-15 23:09:58 +01:00
parent e67a1c9a9c
commit 4f1bf02dc6
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
config/functions
View File

@ -529,7 +529,7 @@ print_color() {
local clr_name="$1" clr_text="$2" clr_actual local clr_name="$1" clr_text="$2" clr_actual
if [ "$DISABLE_COLORS" == "yes" ]; then if [ "$DISABLE_COLORS" == "yes" ]; then
[ -n "${clr_text}" ] && echo -en "${clr_text}" [ $# -eq 2 ] && echo -en "${clr_text}"
return 0 return 0
fi fi
@ -541,9 +541,9 @@ print_color() {
# Otherwise if $clr_name isn't defined, or doesn't exist, then use # Otherwise if $clr_name isn't defined, or doesn't exist, then use
# standard colours. # standard colours.
# #
if [ -n "${clr_actual}" -a -z "${!clr_actual}" ]; then if [[ -n "${clr_actual}" ]] && [[ -z "${!clr_actual}" ]]; then
clr_actual="${clr_name}" clr_actual="${clr_name}"
elif [ -z "${clr_actual}" -o -z "${!clr_actual}" ]; then elif [[ -z "${clr_actual}" ]] || [[ -z "${!clr_actual}" ]]; then
case "${clr_name}" in case "${clr_name}" in
CLR_ERROR) clr_actual="boldred";; CLR_ERROR) clr_actual="boldred";;
CLR_WARNING) clr_actual="boldred";; CLR_WARNING) clr_actual="boldred";;
@ -567,7 +567,7 @@ print_color() {
esac esac
fi fi
if [ -n "${clr_text}" ]; then if [ $# -eq 2 ]; then
echo -en "${!clr_actual}${clr_text}${endcolor}" echo -en "${!clr_actual}${clr_text}${endcolor}"
else else
echo -en "${!clr_actual}" echo -en "${!clr_actual}"