From a230e25c6b17d169c67448bedfe2f63291ee7379 Mon Sep 17 00:00:00 2001 From: 0x5c Date: Thu, 19 May 2022 03:21:51 -0400 Subject: [PATCH 1/2] xbps-src: add way to force colours The tty and NO_COLOR checks aree overriden by config var XBPS_FORCE_COLORS The msg_normal colour is changed from "bold" (1) to "bright white, bold" (97; 1) since github workflows render 1 as bold letters of the same colour. This should have no effect on the vast majority of terminals setups, as 1 is already rendered as bright white with or without bolded font. --- common/xbps-src/shutils/build_dependencies.sh | 8 ++++---- common/xbps-src/shutils/common.sh | 6 +++--- xbps-src | 2 ++ 3 files changed, 9 insertions(+), 7 deletions(-) diff --git a/common/xbps-src/shutils/build_dependencies.sh b/common/xbps-src/shutils/build_dependencies.sh index e4e2210d4e56..bef82d793b89 100644 --- a/common/xbps-src/shutils/build_dependencies.sh +++ b/common/xbps-src/shutils/build_dependencies.sh @@ -406,8 +406,8 @@ install_pkg_deps() { if [[ ${host_binpkg_deps} ]]; then if [ -z "$XBPS_QUIET" ]; then - # normal messages in bold - [[ $NOCOLORS ]] || printf "\033[1m" + # normal messages in bright bold white + [[ $NOCOLORS ]] || printf "\033[97;1m" echo "=> $pkgver: installing host dependencies: ${host_binpkg_deps[@]} ..." [[ $NOCOLORS ]] || printf "\033[m" fi @@ -416,8 +416,8 @@ install_pkg_deps() { if [[ ${binpkg_deps} ]]; then if [ -z "$XBPS_QUIET" ]; then - # normal messages in bold - [[ $NOCOLORS ]] || printf "\033[1m" + # normal messages in bright bold white + [[ $NOCOLORS ]] || printf "\033[97;1m" echo "=> $pkgver: installing target dependencies: ${binpkg_deps[@]} ..." [[ $NOCOLORS ]] || printf "\033[m" fi diff --git a/common/xbps-src/shutils/common.sh b/common/xbps-src/shutils/common.sh index a640528f4d6a..ae96f8e7c87d 100644 --- a/common/xbps-src/shutils/common.sh +++ b/common/xbps-src/shutils/common.sh @@ -140,8 +140,8 @@ msg_warn_nochroot() { msg_normal() { if [ -z "$XBPS_QUIET" ]; then - # normal messages in bold - [ -n "$NOCOLORS" ] || printf "\033[1m" + # normal messages in bright bold white + [ -n "$NOCOLORS" ] || printf "\033[97;1m" printf "=> $@" [ -n "$NOCOLORS" ] || printf "\033[m" fi @@ -165,7 +165,7 @@ report_broken() { } msg_normal_append() { - [ -n "$NOCOLORS" ] || printf "\033[1m" + [ -n "$NOCOLORS" ] || printf "\033[97;1m" printf "$@" [ -n "$NOCOLORS" ] || printf "\033[m" } diff --git a/xbps-src b/xbps-src index dfa059927cc2..6167e38a22dc 100755 --- a/xbps-src +++ b/xbps-src @@ -464,6 +464,8 @@ fi # Read settings from config file [ -s "$XBPS_CONFIG_FILE" ] && . $XBPS_CONFIG_FILE &>/dev/null +[ -n "${XBPS_FORCE_COLORS}" ] && export -n NOCOLORS='' + # Set options passed on command line, after configuration files have been read [ -n "$XBPS_ARG_BUILD_ONLY_ONE_PKG" ] && XBPS_BUILD_ONLY_ONE_PKG=yes [ -n "$XBPS_ARG_IGNORE_BROKENNESS" ] && XBPS_IGNORE_BROKENNESS=1 From 93f1400e4499390f474beca729f3cafff1a9ed79 Mon Sep 17 00:00:00 2001 From: 0x5c Date: Tue, 24 May 2022 23:24:25 -0400 Subject: [PATCH 2/2] common/travis/prepare.sh: force colours in CI --- common/travis/prepare.sh | 1 + 1 file changed, 1 insertion(+) diff --git a/common/travis/prepare.sh b/common/travis/prepare.sh index 550fbd7598d0..63edb72e0e7b 100755 --- a/common/travis/prepare.sh +++ b/common/travis/prepare.sh @@ -7,6 +7,7 @@ /bin/echo -e '\x1b[32mUpdating etc/conf...\x1b[0m' echo XBPS_BUILD_ENVIRONMENT=void-packages-ci >> etc/conf echo XBPS_ALLOW_RESTRICTED=yes >> etc/conf +echo XBPS_FORCE_COLORS=yes >> etc/conf /bin/echo -e '\x1b[32mEnabling ethereal chroot-style...\x1b[0m' echo XBPS_CHROOT_CMD=ethereal >> etc/conf