From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: 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 finch.gentoo.org (Postfix) with ESMTPS id 12F33158287 for ; Tue, 13 May 2025 00:30:22 +0000 (UTC) Received: from lists.gentoo.org (bobolink.gentoo.org [140.211.166.189]) (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) (Authenticated sender: relay-lists.gentoo.org@gentoo.org) by smtp.gentoo.org (Postfix) with ESMTPSA id F08B1343570 for ; Tue, 13 May 2025 00:30:21 +0000 (UTC) Received: from bobolink.gentoo.org (localhost [127.0.0.1]) by bobolink.gentoo.org (Postfix) with ESMTP id E2DA51103C0; Tue, 13 May 2025 00:30:13 +0000 (UTC) Received: from smtp.gentoo.org (smtp.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 bobolink.gentoo.org (Postfix) with ESMTPS id D73741103C0 for ; Tue, 13 May 2025 00:30:13 +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 864F4343570 for ; Tue, 13 May 2025 00:30:13 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id C4A3E2822 for ; Tue, 13 May 2025 00:30:11 +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: <1747051911.34d913e40a36173ba221c035e6e893bbdd0d9cee.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: 34d913e40a36173ba221c035e6e893bbdd0d9cee X-VCS-Branch: master Date: Tue, 13 May 2025 00:30:11 +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: 5c301f2f-5e3a-4915-9c99-f49edc980617 X-Archives-Hash: 58af6d5fb6d2b06b52d1c439f684e8d7 commit: 34d913e40a36173ba221c035e6e893bbdd0d9cee Author: Kerin Millar plushkava net> AuthorDate: Mon May 12 12:11:51 2025 +0000 Commit: Sam James gentoo org> CommitDate: Mon May 12 12:11:51 2025 +0000 URL: https://gitweb.gentoo.org/proj/gentoo-functions.git/commit/?id=34d913e4 Employ just one test for set -e and -u Signed-off-by: Kerin Millar plushkava.net> functions.sh | 9 ++------- 1 file changed, 2 insertions(+), 7 deletions(-) diff --git a/functions.sh b/functions.sh index e4f5a7c..72e3588 100644 --- a/functions.sh +++ b/functions.sh @@ -45,14 +45,9 @@ warn() printf '%s: %s\n' "${0##*/}" "$*" >&2 } -case $- in *e*) +case $- in *[eu]*) # https://lists.gnu.org/archive/html/help-bash/2020-04/msg00049.html - warn "gentoo-functions does not support the errexit option; unexpected behaviour may ensue" -esac - -case $- in *u*) - # https://lists.gnu.org/archive/html/help-bash/2020-04/msg00049.html - warn "gentoo-functions does not support the nounset option; unexpected behaviour may ensue" + warn "gentoo-functions supports neither the errexit option nor the nounset option; unexpected behaviour may ensue" esac case ${KSH_VERSION} in 'Version AJM 93'*)