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 CBDC7158094 for ; Fri, 29 Jul 2022 02:03:33 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 9A512E0E3E; Fri, 29 Jul 2022 02:03:31 +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)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 7A28CE0E3E for ; Fri, 29 Jul 2022 02:03:31 +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 6BF143411C5 for ; Fri, 29 Jul 2022 02:03:30 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id BECE7554 for ; Fri, 29 Jul 2022 02:03:28 +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: <1659060198.7b4d2dbba7937c7576631ffeb3538f81ca9e02f7.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: 7b4d2dbba7937c7576631ffeb3538f81ca9e02f7 X-VCS-Branch: master Date: Fri, 29 Jul 2022 02:03:28 +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: a5442934-9557-4f2b-b6db-97b186a16283 X-Archives-Hash: b10ee2f7af1b6554ee265ed1ba58be38 commit: 7b4d2dbba7937c7576631ffeb3538f81ca9e02f7 Author: Sam James gentoo org> AuthorDate: Thu Jul 28 01:01:15 2022 +0000 Commit: Sam James gentoo org> CommitDate: Fri Jul 29 02:03:18 2022 +0000 URL: https://gitweb.gentoo.org/proj/gentoo-functions.git/commit/?id=7b4d2dbb functions.sh: sort color definition ordering Makes it easier to compare with Portage's isolated-functions.sh. Signed-off-by: Sam James gentoo.org> functions.sh | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/functions.sh b/functions.sh index be67536..0b9e9cf 100644 --- a/functions.sh +++ b/functions.sh @@ -437,21 +437,21 @@ fi # Setup the colors so our messages all look pretty if yesno "${RC_NOCOLOR}"; then - unset GOOD WARN BAD NORMAL HILITE BRACKET + unset BAD BRACKET GOOD HILITE NORMAL WARN elif (command -v tput && tput colors) >/dev/null 2>&1; then - GOOD="$(tput sgr0)$(tput bold)$(tput setaf 2)" - WARN="$(tput sgr0)$(tput bold)$(tput setaf 3)" BAD="$(tput sgr0)$(tput bold)$(tput setaf 1)" - HILITE="$(tput sgr0)$(tput bold)$(tput setaf 6)" BRACKET="$(tput sgr0)$(tput bold)$(tput setaf 4)" + GOOD="$(tput sgr0)$(tput bold)$(tput setaf 2)" + HILITE="$(tput sgr0)$(tput bold)$(tput setaf 6)" NORMAL="$(tput sgr0)" + WARN="$(tput sgr0)$(tput bold)$(tput setaf 3)" else - GOOD=$(printf '\033[32;01m') - WARN=$(printf '\033[33;01m') BAD=$(printf '\033[31;01m') - HILITE=$(printf '\033[36;01m') BRACKET=$(printf '\033[34;01m') + GOOD=$(printf '\033[32;01m') + HILITE=$(printf '\033[36;01m') NORMAL=$(printf '\033[0m') + WARN=$(printf '\033[33;01m') fi # If we made it this far, the script succeeded, so don't let failures