root/nix-tools
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

[util-msg] fix colors

Browse source
This commit is contained in:
udeved 2015-03-01 23:55:20 +01:00
parent 620b11ae5d
commit fbcabe0489
1 changed files with 17 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

33
lib/util-msg.sh
View file

@ -26,55 +26,56 @@ if [[ -t 2 ]]; then
CYAN="${BOLD}$(tput setaf 6)" CYAN="${BOLD}$(tput setaf 6)"
WHITE="${BOLD}$(tput setaf 7)" WHITE="${BOLD}$(tput setaf 7)"
else else
ALL_OFF="\033[01;00m" ALL_OFF="\e[0m"
RED="\033[01;31m" BOLD="\e[1m"
GREEN="\033[01;32m" RED="${BOLD}\e[31m"
YELLOW="\033[01;33m" GREEN="${BOLD}\e[32m"
BLUE="\033[01;34m" YELLOW="${BOLD}\e[33m"
MAGENTA="\033[01;35m" BLUE="${BOLD}\e[34m"
CYAN="\033[01;36m" MAGENTA="${BOLD}\e[35m"
WHITE="\033[01;37m" CYAN="${BOLD}\e[36m"
WHITE="${BOLD}\e[37m"
fi fi
fi fi
readonly ALL_OFF BOLD BLUE GREEN RED YELLOW CYAN MAGENTA WHITE readonly ALL_OFF BOLD BLUE GREEN RED YELLOW CYAN MAGENTA WHITE
plain() { plain() {
local mesg=$1; shift local mesg=$1; shift
printf "${WHITE} ${mesg}${ALL_OFF}\n" "$@" >&2 printf "${BOLD} ${mesg}${ALL_OFF}\n" "$@" >&2
} }
msg() { msg() {
local mesg=$1; shift local mesg=$1; shift
printf "${GREEN}==>${ALL_OFF}${WHITE} ${mesg}${ALL_OFF}\n" "$@" >&2 printf "${GREEN}==>${ALL_OFF}${BOLD} ${mesg}${ALL_OFF}\n" "$@" >&2
} }
msg2() { msg2() {
local mesg=$1; shift local mesg=$1; shift
printf "${BLUE} ->${ALL_OFF}${WHITE} ${mesg}${ALL_OFF}\n" "$@" >&2 printf "${BLUE} ->${ALL_OFF}${BOLD} ${mesg}${ALL_OFF}\n" "$@" >&2
} }
msg3() { msg3() {
local mesg=$1; shift local mesg=$1; shift
printf "${YELLOW} -->${ALL_OFF}${WHITE} ${mesg}${ALL_OFF}\n" "$@" >&2 printf "${YELLOW} -->${ALL_OFF}${BOLD} ${mesg}${ALL_OFF}\n" "$@" >&2
} }
warning() { warning() {
local mesg=$1; shift local mesg=$1; shift
printf "${YELLOW}==> WARNING:${ALL_OFF}${WHITE} ${mesg}${ALL_OFF}\n" "$@" >&2 printf "${YELLOW}==> WARNING:${ALL_OFF}${BOLD} ${mesg}${ALL_OFF}\n" "$@" >&2
} }
error() { error() {
local mesg=$1; shift local mesg=$1; shift
printf "${RED}==> ERROR:${ALL_OFF}${WHITE} ${mesg}${ALL_OFF}\n" "$@" >&2 printf "${RED}==> ERROR:${ALL_OFF}${BOLD} ${mesg}${ALL_OFF}\n" "$@" >&2
} }
stat_busy() { stat_busy() {
local mesg=$1; shift local mesg=$1; shift
printf "${GREEN}==>${ALL_OFF}${WHITE} ${mesg}...${ALL_OFF}" >&2 printf "${GREEN}==>${ALL_OFF}${BOLD} ${mesg}...${ALL_OFF}" >&2
} }
stat_done() { stat_done() {
printf "${WHITE}done${ALL_OFF}\n" >&2 printf "${BOLD}done${ALL_OFF}\n" >&2
} }
setup_workdir() { setup_workdir() {