colors: Remove the need to evaluate \033 escape

3 files changed, 42 insertions, 39 deletions

diff --git a/src/share/poudriere/common.sh b/src/share/poudriere/common.sh
index 03e6840a..38f915b3 100755
--- a/src/share/poudriere/common.sh
+++ b/src/share/poudriere/common.sh
@@ -146,11 +146,14 @@ _msg_n() {
 		unset elapsed
 		arrow="=>>"
 	fi
-	if [ -n "${COLOR_ARROW-}" ] || [ -z "${1##*\033[*}" ]; then
-		printf "${COLOR_ARROW}${elapsed}${DRY_MODE-}${arrow:+${COLOR_ARROW}${arrow} }${COLOR_RESET}%b${COLOR_RESET}${NL}" "$*"
-	else
-		printf "${elapsed}${DRY_MODE-}${arrow:+${arrow} }%b${NL}" "$*"
-	fi
+	case "${COLOR_ARROW-}${1}" in
+	*$'\033'"["*)
+		printf "${COLOR_ARROW}${elapsed}${DRY_MODE-}${arrow:+${COLOR_ARROW}${arrow} }${COLOR_RESET}%s${COLOR_RESET}${NL}" "$*"
+		;;
+	*)
+		printf "${elapsed}${DRY_MODE-}${arrow:+${arrow} }%s${NL}" "$*"
+		;;
+	esac
 }
 
 msg_n() {
diff --git a/src/share/poudriere/include/colors.pre.sh b/src/share/poudriere/include/colors.pre.sh
index b1d7d013..2847d942 100644
--- a/src/share/poudriere/include/colors.pre.sh
+++ b/src/share/poudriere/include/colors.pre.sh
@@ -24,35 +24,35 @@
 # OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 # SUCH DAMAGE.
 
-COLOR_RESET="\033[0;0m"
-COLOR_BOLD="\033[1m"
-COLOR_UNDER="\033[4m"
-COLOR_BLINK="\033[5m"
-COLOR_INVERSE="\033[7m"
+COLOR_RESET=$'\033'"[0;0m"
+COLOR_BOLD=$'\033'"[1m"
+COLOR_UNDER=$'\033'"[4m"
+COLOR_BLINK=$'\033'"[5m"
+COLOR_INVERSE=$'\033'"[7m"
 
-COLOR_BLACK="\033[0;30m"
-COLOR_RED="\033[0;31m"
-COLOR_GREEN="\033[0;32m"
-COLOR_BROWN="\033[0;33m"
-COLOR_BLUE="\033[0;34m"
-COLOR_MAGENTA="\033[0;35m"
-COLOR_CYAN="\033[0;36m"
-COLOR_LIGHT_GRAY="\033[0;37m"
+COLOR_BLACK=$'\033'"[0;30m"
+COLOR_RED=$'\033'"[0;31m"
+COLOR_GREEN=$'\033'"[0;32m"
+COLOR_BROWN=$'\033'"[0;33m"
+COLOR_BLUE=$'\033'"[0;34m"
+COLOR_MAGENTA=$'\033'"[0;35m"
+COLOR_CYAN=$'\033'"[0;36m"
+COLOR_LIGHT_GRAY=$'\033'"[0;37m"
 
-COLOR_DARK_GRAY="\033[1;30m"
-COLOR_LIGHT_RED="\033[1;31m"
-COLOR_LIGHT_GREEN="\033[1;32m"
-COLOR_YELLOW="\033[1;33m"
-COLOR_LIGHT_BLUE="\033[1;34m"
-COLOR_LIGHT_MAGENTA="\033[1;35m"
-COLOR_LIGHT_CYAN="\033[1;36m"
-COLOR_WHITE="\033[1;37m"
+COLOR_DARK_GRAY=$'\033'"[1;30m"
+COLOR_LIGHT_RED=$'\033'"[1;31m"
+COLOR_LIGHT_GREEN=$'\033'"[1;32m"
+COLOR_YELLOW=$'\033'"[1;33m"
+COLOR_LIGHT_BLUE=$'\033'"[1;34m"
+COLOR_LIGHT_MAGENTA=$'\033'"[1;35m"
+COLOR_LIGHT_CYAN=$'\033'"[1;36m"
+COLOR_WHITE=$'\033'"[1;37m"
 
-COLOR_BG_BLACK="\033[40m"
-COLOR_BG_RED="\033[41m"
-COLOR_BG_GREEN="\033[42m"
-COLOR_BG_BROWN="\033[43m"
-COLOR_BG_BLUE="\033[44m"
-COLOR_BG_MAGENTA="\033[45m"
-COLOR_BG_CYAN="\033[46m"
-COLOR_BG_LIGHT_GRAY="\033[47m"
+COLOR_BG_BLACK=$'\033'"[40m"
+COLOR_BG_RED=$'\033'"[41m"
+COLOR_BG_GREEN=$'\033'"[42m"
+COLOR_BG_BROWN=$'\033'"[43m"
+COLOR_BG_BLUE=$'\033'"[44m"
+COLOR_BG_MAGENTA=$'\033'"[45m"
+COLOR_BG_CYAN=$'\033'"[46m"
+COLOR_BG_LIGHT_GRAY=$'\033'"[47m"
diff --git a/src/share/poudriere/include/util.sh b/src/share/poudriere/include/util.sh
index 10a45d09..e8873acc 100644
--- a/src/share/poudriere/include/util.sh
+++ b/src/share/poudriere/include/util.sh
@@ -1326,7 +1326,7 @@ stripansi() {
         local _gsub
 
 	case "${_input}" in
-	*\\033*) ;;
+	*$'\033'"["*) ;;
 	*)
 		setvar "${_output_var}" "${_input}"
 		return 0
@@ -1334,10 +1334,10 @@ stripansi() {
 	esac
 
         _gsub="${_input}"
-        _gsub "${_gsub}"        '\\033[?m' ""
-        _gsub "${_gsub}"        '\\033[??m' ""
-        _gsub "${_gsub}"        '\\033[?;?m' ""
-        _gsub "${_gsub}"        '\\033[?;??m' ""
+        _gsub "${_gsub}"        $'\033'"[?m" ""
+        _gsub "${_gsub}"        $'\033'"[??m" ""
+        _gsub "${_gsub}"        $'\033'"[?;?m" ""
+        _gsub "${_gsub}"        $'\033'"[?;??m" ""
 
         setvar "${_output_var}" "${_gsub}"
 }