bryson/pacman
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

makepkg: check tput support before using

Browse source 
Prevent makepkg aborting whe colors are enabled and the terminal
does not support setting colors by tput.

Signed-off-by: Allan McRae <allan@archlinux.org>
Signed-off-by: Dan McGee <dan@archlinux.org>
This commit is contained in:
Allan McRae 2010-08-03 14:29:26 +10:00 • committed by Dan McGee
parent 0d6efb35ce
commit b02bda75f1
1 changed files with 16 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
scripts/makepkg.sh.in
View file

@ -1629,12 +1629,22 @@ PACMAN=${PACMAN:-pacman}
# check if messages are to be printed using color # check if messages are to be printed using color
unset ALL_OFF BOLD BLUE GREEN RED YELLOW unset ALL_OFF BOLD BLUE GREEN RED YELLOW
if [[ -t 2 && ! $USE_COLOR = "n" && $(check_buildenv color) = "y" ]]; then if [[ -t 2 && ! $USE_COLOR = "n" && $(check_buildenv color) = "y" ]]; then
# prefer terminal safe colored and bold text when tput is supported
if tput setaf 0 &>/dev/null; then
ALL_OFF="$(tput sgr0)" ALL_OFF="$(tput sgr0)"
BOLD="$(tput bold)" BOLD="$(tput bold)"
BLUE="${BOLD}$(tput setaf 4)" BLUE="${BOLD}$(tput setaf 4)"
GREEN="${BOLD}$(tput setaf 2)" GREEN="${BOLD}$(tput setaf 2)"
RED="${BOLD}$(tput setaf 1)" RED="${BOLD}$(tput setaf 1)"
YELLOW="${BOLD}$(tput setaf 3)" YELLOW="${BOLD}$(tput setaf 3)"
else
ALL_OFF="\033[1;0m"
BOLD="\033[1;1m"
BLUE="${BOLD}\033[1;34m"
GREEN="${BOLD}\033[1;32m"
RED="${BOLD}\033[1;31m"
YELLOW="${BOLD}\033[1;33m"
fi
fi fi
readonly ALL_OFF BOLD BLUE GREEN RED YELLOW readonly ALL_OFF BOLD BLUE GREEN RED YELLOW