[gentoo-commits] proj/gentoo-functions:master commit in: /, functions/

[Sam James]

commit:     cd6c0d7e1c7a1a05dab6f1cb05826bbfdcbb82fc
Author:     Kerin Millar <kfm <AT> plushkava <DOT> net>
AuthorDate: Sun Jan 25 23:58:39 2026 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Tue Jan 27 08:54:37 2026 +0000
URL:        
https://gitweb.gentoo.org/proj/gentoo-functions.git/commit/?id=cd6c0d7e

Revise shellcheck exemptions to accord with v0.11.0

functions.sh:
        - refrain from muting SC2209 and SC3013 globablly

functions/rc.sh:
        - refrain from muting SC3013 globally
        - mute an additional instance of SC2154 in _eend()

test-functions:
        - refrain from muting SC2317 globally
        - mute SC2329 globally
        - mute an additional instance of SC2034 in test_hr()

Signed-off-by: Kerin Millar <kfm <AT> plushkava.net>

 functions.sh    | 2 +-
 functions/rc.sh | 3 +--
 test-functions  | 3 ++-
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/functions.sh b/functions.sh
index ac4b69e..1bb5ead 100644
--- a/functions.sh
+++ b/functions.sh
@@ -1,6 +1,6 @@
 # Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
-# shellcheck shell=sh disable=2153,2209,3013,3043
+# shellcheck shell=sh disable=2153,3043
 
 # This file contains a series of function declarations followed by some
 # initialisation code. Functions intended for internal use shall be prefixed

diff --git a/functions/rc.sh b/functions/rc.sh
index aade242..c6d3d00 100644
--- a/functions/rc.sh
+++ b/functions/rc.sh
@@ -1,6 +1,6 @@
 # Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
-# shellcheck shell=sh disable=3013,3043
+# shellcheck shell=sh disable=3043
 
 # This file contains alternative implementations for some of the functions and
 # utilities provided by OpenRC. Please refer to ../functions.sh for coding
@@ -356,7 +356,6 @@ _eend()
                return "${retval}"
        else
                # Generate an indicator for ebegin's successful conclusion.
-               # shellcheck disable=2154
                if _update_tty_level <&1; [ "${genfun_tty}" -eq 0 ]; then
                        msg="[ ok ]"
                else

diff --git a/test-functions b/test-functions
index 0e5561c..feb46f5 100755
--- a/test-functions
+++ b/test-functions
@@ -1,5 +1,5 @@
 #!/bin/sh
-# shellcheck disable=1007,2015,2031,2164,2317,3043
+# shellcheck disable=1007,2015,2031,2164,2329,3043
 
 # Requires mktemp(1), which is not a standard utility, but is commonly
 # available. The implementations provided by GNU coreutils, busybox and toybox
@@ -672,6 +672,7 @@ test_hr() {
                expected=$1
                shift
                test_description="hr $(quote_args "$@")"
+               # shellcheck disable=2034
                hr="leakage"
                test "$(hr "$@")" = "${expected}"
        }