From 37beacd37d76a069c3819d5c67e07d15a9934069 Mon Sep 17 00:00:00 2001 From: Alyssa Ross Date: Wed, 7 Sep 2016 20:24:02 +0100 Subject: Revert "Implement opoo in bash" This reverts commit 2498d99a143d0e50e92a0aa60316d47c9ea83edc. --- Library/Homebrew/brew.sh | 29 +++++++---------------------- 1 file changed, 7 insertions(+), 22 deletions(-) (limited to 'Library') diff --git a/Library/Homebrew/brew.sh b/Library/Homebrew/brew.sh index fd1accef5..1651e8262 100644 --- a/Library/Homebrew/brew.sh +++ b/Library/Homebrew/brew.sh @@ -1,35 +1,20 @@ HOMEBREW_VERSION="0.9.9" -o() { - if [[ $# -eq 0 ]] +onoe() { + if [[ -t 2 ]] # check whether stderr is a tty. then - /bin/cat + echo -ne "\033[4;31mError\033[0m: " >&2 # highlight Error with underline and red color else - echo "$*" + echo -n "Error: " >&2 fi -} - -highlight() { - if [[ -t 1 ]] # check whether stdout is a tty. + if [[ $# -eq 0 ]] then - echo -ne "\033[4;$1m$2\033[0m" + /bin/cat >&2 else - echo -n "$2" + echo "$*" >&2 fi } -opoo() { - highlight 33 Warning >&2 # yellow - echo -n ": " >&2 - o "$@" >&2 -} - -onoe() { - highlight 31 Error >&2 # red - echo -n ": " >&2 - o "$@" >&2 -} - odie() { onoe "$@" exit 1 -- cgit v1.2.3