From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 2F9991581D3 for ; Fri, 17 May 2024 04:03:54 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 7A370E2A77; Fri, 17 May 2024 04:03:52 +0000 (UTC) Received: from smtp.gentoo.org (woodpecker.gentoo.org [140.211.166.183]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 4B36FE2A78 for ; Fri, 17 May 2024 04:03:52 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 54A6134300D for ; Fri, 17 May 2024 04:03:51 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id B377F1ADC for ; Fri, 17 May 2024 04:03:48 +0000 (UTC) From: "Sam James" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Sam James" Message-ID: <1715910020.2ba6c4f1f86ff15cf11fdb515a22989a3d16f5ab.sam@gentoo> Subject: [gentoo-commits] proj/gentoo-functions:master commit in: / X-VCS-Repository: proj/gentoo-functions X-VCS-Files: functions.sh X-VCS-Directories: / X-VCS-Committer: sam X-VCS-Committer-Name: Sam James X-VCS-Revision: 2ba6c4f1f86ff15cf11fdb515a22989a3d16f5ab X-VCS-Branch: master Date: Fri, 17 May 2024 04:03:48 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: 53a49dc5-f1a1-486b-8925-cc717b85dc7b X-Archives-Hash: 93a19852670005d5bf543275faeef581 commit: 2ba6c4f1f86ff15cf11fdb515a22989a3d16f5ab Author: Kerin Millar plushkava net> AuthorDate: Thu May 16 12:32:50 2024 +0000 Commit: Sam James gentoo org> CommitDate: Fri May 17 01:40:20 2024 +0000 URL: https://gitweb.gentoo.org/proj/gentoo-functions.git/commit/?id=2ba6c4f1 Rename _has_monochrome_terminal() to _has_color_terminal() This also inverts the sense of its exit status but it feels a little more natural this way. Moreover, the behaviour now matches the description of the function. Signed-off-by: Kerin Millar plushkava.net> functions.sh | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/functions.sh b/functions.sh index e2af8cf..e494765 100644 --- a/functions.sh +++ b/functions.sh @@ -444,18 +444,18 @@ _has_dumb_terminal() # # Tries to determine whether the terminal supports ECMA-48 SGR color sequences. # -_has_monochrome_terminal() +_has_color_terminal() { local colors # The tput(1) invocation is not portable, though ncurses suffices. In # this day and age, it is exceedingly unlikely that it will be needed. if _has_dumb_terminal; then - true + false elif colors=$(tput colors 2>/dev/null) && is_int "${colors}"; then - test "${colors}" -eq -1 + test "${colors}" -gt 0 else - false + true fi } @@ -545,7 +545,7 @@ else done fi -if _has_monochrome_terminal || yesno "${RC_NOCOLOR}"; then +if ! _has_color_terminal || yesno "${RC_NOCOLOR}"; then unset -v BAD BRACKET GOOD HILITE NORMAL WARN else # Define some ECMA-48 SGR sequences for color support. These variables