[PR PATCH] xbps-src: set NOCOLOR early

[PR PATCH] xbps-src: set NOCOLOR early

[voidlinux-github]

[-- Attachment #1: Type: text/plain, Size: 324 bytes --]

There is a new pull request by Johnnynator against master on the void-packages repository

https://github.com/Johnnynator/void-packages NOCOLOR
https://github.com/void-linux/void-packages/pull/12554

xbps-src: set NOCOLOR early
None

A patch file from https://github.com/void-linux/void-packages/pull/12554.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-NOCOLOR-12554.patch --]
[-- Type: application/text/x-diff, Size: 1028 bytes --]

From 2acafff721b748e79f688d2b936fab9825ef3ab2 Mon Sep 17 00:00:00 2001
From: John <johnz@posteo.net>
Date: Wed, 19 Jun 2019 18:10:44 +0200
Subject: [PATCH] xbps-src: set NOCOLOR early

---
 xbps-src | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/xbps-src b/xbps-src
index e32b6ff6215..00daec93ce9 100755
--- a/xbps-src
+++ b/xbps-src
@@ -434,6 +434,13 @@ shift $(($OPTIND - 1))
 
 [ $# -eq 0 ] && usage && exit 1
 
+# Check if stdout is a tty; if false disable colors.
+test -t 1 || export NOCOLORS=1
+# http://no-color.org
+if [ -n "${NO_COLOR+x}" ]; then
+    export NOCOLORS=1
+fi
+
 umask 022
 
 #
@@ -573,13 +580,6 @@ if [ -n "$2" ]; then
     XBPS_TARGET_PKG="${2##*/}"
 fi
 
-# Check if stdout is a tty; if false disable colors.
-test -t 1 || export NOCOLORS=1
-# http://no-color.org
-if [ -n "${NO_COLOR+x}" ]; then
-    export NOCOLORS=1
-fi
-
 chroot_check() {
     if [ -f $XBPS_MASTERDIR/.xbps_chroot_init -o "$XBPS_CHROOT_CMD" = "ethereal" ]; then
         export CHROOT_READY=1

Re: [PR PATCH] [Merged]: xbps-src: set NOCOLOR early

[voidlinux-github]

[-- Attachment #1: Type: text/plain, Size: 164 bytes --]

There's a merged pull request on the void-packages repository

xbps-src: set NOCOLOR early
https://github.com/void-linux/void-packages/pull/12554
Description: None