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 A7AC715800F for ; Sun, 12 Feb 2023 06:53:25 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id E49FAE08F2; Sun, 12 Feb 2023 06:53:24 +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 CA46BE08F4 for ; Sun, 12 Feb 2023 06:53:24 +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 D7D83340DC3 for ; Sun, 12 Feb 2023 06:53:23 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 787F77D8 for ; Sun, 12 Feb 2023 06:53:22 +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: <1676184797.bfc30a7744ad0043969969250f01c4d3fd74fc55.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: bfc30a7744ad0043969969250f01c4d3fd74fc55 X-VCS-Branch: master Date: Sun, 12 Feb 2023 06:53:22 +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: 2381cae4-6f05-46fb-ac15-9fadb01f1eff X-Archives-Hash: aba9c19dcbd4cfd3cd067a97cd4e295a commit: bfc30a7744ad0043969969250f01c4d3fd74fc55 Author: Kerin Millar plushkava net> AuthorDate: Sat Feb 11 01:20:45 2023 +0000 Commit: Sam James gentoo org> CommitDate: Sun Feb 12 06:53:17 2023 +0000 URL: https://gitweb.gentoo.org/proj/gentoo-functions.git/commit/?id=bfc30a77 Attend to several instances of SC2086, courtesy of shellcheck Signed-off-by: Kerin Millar plushkava.net> Signed-off-by: Sam James gentoo.org> functions.sh | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/functions.sh b/functions.sh index eb9a168..33ef26e 100644 --- a/functions.sh +++ b/functions.sh @@ -55,7 +55,7 @@ yesno() esac local value= - eval value=\$${1} + eval "value=\$${1}" case "$value" in [Yy][Ee][Ss]|[Tt][Rr][Uu][Ee]|[Oo][Nn]|1) return 0;; [Nn][Oo]|[Ff][Aa][Ll][Ss][Ee]|[Oo][Ff][Ff]|0) return 1;; @@ -247,7 +247,7 @@ _eend() printf "%$(( COLS - LAST_E_LEN - 6 ))s%b\n" '' "${msg}" fi - return ${retval} + return "${retval}" } # @@ -262,7 +262,7 @@ eend() _eend "${retval}" eerror "$*" LAST_E_CMD="eend" - return ${retval} + return "${retval}" } # @@ -277,7 +277,7 @@ ewend() _eend "${retval}" ewarn "$*" LAST_E_CMD="ewend" - return ${retval} + return "${retval}" } # v-e-commands honor EINFO_VERBOSE which defaults to no. @@ -310,13 +310,13 @@ vebegin() veend() { yesno "${EINFO_VERBOSE}" && { eend "$@"; return $?; } - return ${1:-0} + return "${1:-0}" } vewend() { yesno "${EINFO_VERBOSE}" && { ewend "$@"; return $?; } - return ${1:-0} + return "${1:-0}" } veindent()