From 04b78d965796b5722da5f20b15f9346b9b8d1de9 Mon Sep 17 00:00:00 2001
From: Krzesimir Nowak <knowak@microsoft.com>
Date: Wed, 27 Nov 2024 17:17:58 +0100
Subject: [PATCH] pkg-auto: Address shellcheck complaints

---
 pkg_auto/impl/gentoo_ver.sh   | 10 +++++-----
 pkg_auto/impl/pkg_auto_lib.sh |  1 +
 2 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/pkg_auto/impl/gentoo_ver.sh b/pkg_auto/impl/gentoo_ver.sh
index 9db3ab7d1c..1df280be27 100644
--- a/pkg_auto/impl/gentoo_ver.sh
+++ b/pkg_auto/impl/gentoo_ver.sh
@@ -48,13 +48,13 @@ _ver_compare() {
 
 	re=${VER_ERE}
 
-	[[ ${va} =~ ${re} ]] || fail "${FUNCNAME}: invalid version: ${va}"
+	[[ ${va} =~ ${re} ]] || fail "${FUNCNAME[0]}: invalid version: ${va}"
 	an=${BASH_REMATCH[1]}
 	al=${BASH_REMATCH[3]}
 	as=${BASH_REMATCH[4]}
 	ar=${BASH_REMATCH[7]}
 
-	[[ ${vb} =~ ${re} ]] || fail "${FUNCNAME}: invalid version: ${vb}"
+	[[ ${vb} =~ ${re} ]] || fail "${FUNCNAME[0]}: invalid version: ${vb}"
 	bn=${BASH_REMATCH[1]}
 	bl=${BASH_REMATCH[3]}
 	bs=${BASH_REMATCH[4]}
@@ -136,14 +136,14 @@ ver_test() {
 		va=${PVR}
 	fi
 
-	[[ $# -eq 2 ]] || fail "${FUNCNAME}: bad number of arguments"
+	[[ $# -eq 2 ]] || fail "${FUNCNAME[0]}: bad number of arguments"
 
 	op=${1}
 	vb=${2}
 
 	case ${op} in
 		-eq|-ne|-lt|-le|-gt|-ge) ;;
-		*) fail "${FUNCNAME}: invalid operator: ${op}" ;;
+		*) fail "${FUNCNAME[0]}: invalid operator: ${op}" ;;
 	esac
 
 	_ver_compare "${va}" "${vb}"
@@ -171,7 +171,7 @@ function gentoo_ver_cmp_out() {
     out_ref=0
     _ver_compare "${v1}" "${v2}" || out_ref=${?}
     case ${out_ref} in
-        1|2|3)
+        "${GV_LT}"|"${GV_EQ}"|"${GV_GT}")
             return 0
             ;;
         *)
diff --git a/pkg_auto/impl/pkg_auto_lib.sh b/pkg_auto/impl/pkg_auto_lib.sh
index 00acf39270..437efd619e 100644
--- a/pkg_auto/impl/pkg_auto_lib.sh
+++ b/pkg_auto/impl/pkg_auto_lib.sh
@@ -2814,6 +2814,7 @@ function handle_gentoo_sync() {
     local path in_ps category
     if [[ "${old_head}" != "${new_head}" ]]; then
         while read -r path; do
+            # shellcheck disable=SC2153 # PORTAGE_STABLE_SUFFIX is not a misspelling
             if [[ ${path} != "${PORTAGE_STABLE_SUFFIX}/"* ]]; then
                 continue
             fi