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 9D95B1581D3 for ; Fri, 17 May 2024 04:03:51 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id DB6F4E2A72; Fri, 17 May 2024 04:03:50 +0000 (UTC) Received: from smtp.gentoo.org (dev.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id BC719E2A6F for ; Fri, 17 May 2024 04:03:50 +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) server-digest SHA256) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id B6F1E342FFC for ; Fri, 17 May 2024 04:03:49 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 1ACD91AD2 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: <1715826850.83a380418dd6b669e633074def33edc370978b01.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: 83a380418dd6b669e633074def33edc370978b01 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: 12c324a8-f886-47e3-88b5-d8f3647fe8f6 X-Archives-Hash: 7a61bdd26f1253e5a30f4355495485b3 commit: 83a380418dd6b669e633074def33edc370978b01 Author: Kerin Millar plushkava net> AuthorDate: Thu May 16 02:15:15 2024 +0000 Commit: Sam James gentoo org> CommitDate: Thu May 16 02:34:10 2024 +0000 URL: https://gitweb.gentoo.org/proj/gentoo-functions.git/commit/?id=83a38041 Remove some superfluous boolean variable declarations Remove the superfluous declarations of EINFO_QUIET, EINFO_VERBOSE, RC_NOCOLOR and genfun_indent. No attempt has been made to appease the nounset cultists because it was already the case that gentoo-functions be incompatible with it. Should push come to shove, nounset could be accommodated but such a requirement ought then to be attended to in its own right. Signed-off-by: Kerin Millar plushkava.net> functions.sh | 14 +++----------- 1 file changed, 3 insertions(+), 11 deletions(-) diff --git a/functions.sh b/functions.sh index 6647c67..dfbbe31 100644 --- a/functions.sh +++ b/functions.sh @@ -488,14 +488,7 @@ _update_tty_level() # This is the main script, please add all functions above this point! # shellcheck disable=2034 -RC_GOT_FUNCTIONS="yes" - -# Dont output to stdout? -EINFO_QUIET="${EINFO_QUIET:-no}" -EINFO_VERBOSE="${EINFO_VERBOSE:-no}" - -# Set the initial value for e-message indentation. -genfun_indent= +RC_GOT_FUNCTIONS=yes # Assign the LF ('\n') character for later expansion. POSIX Issue 8 permits # $'\n' but it may take years for it to be commonly implemented. @@ -513,13 +506,12 @@ fi # Should we use color? if [ -n "${NO_COLOR}" ]; then # See https://no-color.org/. - RC_NOCOLOR="yes" + RC_NOCOLOR=yes else - RC_NOCOLOR="${RC_NOCOLOR:-no}" for _ in "$@"; do case $_ in --nocolor|--nocolour|-C) - RC_NOCOLOR="yes" + RC_NOCOLOR=yes break esac done