Skip to content

Commit

Permalink
Merge pull request #1896 from MilhouseVH/le90_custom_build_colours_fix
Browse files Browse the repository at this point in the history
config/functions: fix bash-4.4 issue, and empty 2nd param behaviour
  • Loading branch information
lrusak committed Aug 21, 2017
2 parents 2800b21 + 4f1bf02 commit fb42b77
Showing 1 changed file with 4 additions and 4 deletions.
8 changes: 4 additions & 4 deletions config/functions
Original file line number Diff line number Diff line change
Expand Up @@ -529,7 +529,7 @@ print_color() {
local clr_name="$1" clr_text="$2" clr_actual

if [ "$DISABLE_COLORS" == "yes" ]; then
[ -n "${clr_text}" ] && echo -en "${clr_text}"
[ $# -eq 2 ] && echo -en "${clr_text}"
return 0
fi

Expand All @@ -541,9 +541,9 @@ print_color() {
# Otherwise if $clr_name isn't defined, or doesn't exist, then use
# standard colours.
#
if [ -n "${clr_actual}" -a -z "${!clr_actual}" ]; then
if [[ -n "${clr_actual}" ]] && [[ -z "${!clr_actual}" ]]; then
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
CLR_ERROR) clr_actual="boldred";;
CLR_WARNING) clr_actual="boldred";;
Expand All @@ -567,7 +567,7 @@ print_color() {
esac
fi

if [ -n "${clr_text}" ]; then
if [ $# -eq 2 ]; then
echo -en "${!clr_actual}${clr_text}${endcolor}"
else
echo -en "${!clr_actual}"
Expand Down

0 comments on commit fb42b77

Please sign in to comment.