mirrors/flatcar-scripts
1
0
Fork 0
mirror of https://github.com/flatcar/scripts.git synced 2025-08-12 07:26:58 +02:00
Code Issues Packages Projects Releases Wiki Activity

pkg-auto: Address shellcheck complaints

Browse Source
This commit is contained in:
Krzesimir Nowak 2024-11-27 17:17:58 +01:00
parent 4eba9bec28
commit 04b78d9657
2 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
pkg_auto/impl/gentoo_ver.sh
View File

@ -48,13 +48,13 @@ _ver_compare() {
re=${VER_ERE} re=${VER_ERE}
[[ ${va} =~ ${re} ]] || fail "${FUNCNAME}: invalid version: ${va}" [[ ${va} =~ ${re} ]] || fail "${FUNCNAME[0]}: invalid version: ${va}"
an=${BASH_REMATCH[1]} an=${BASH_REMATCH[1]}
al=${BASH_REMATCH[3]} al=${BASH_REMATCH[3]}
as=${BASH_REMATCH[4]} as=${BASH_REMATCH[4]}
ar=${BASH_REMATCH[7]} ar=${BASH_REMATCH[7]}
[[ ${vb} =~ ${re} ]] || fail "${FUNCNAME}: invalid version: ${vb}" [[ ${vb} =~ ${re} ]] || fail "${FUNCNAME[0]}: invalid version: ${vb}"
bn=${BASH_REMATCH[1]} bn=${BASH_REMATCH[1]}
bl=${BASH_REMATCH[3]} bl=${BASH_REMATCH[3]}
bs=${BASH_REMATCH[4]} bs=${BASH_REMATCH[4]}
@ -136,14 +136,14 @@ ver_test() {
va=${PVR} va=${PVR}
fi fi
[[ $# -eq 2 ]] || fail "${FUNCNAME}: bad number of arguments" [[ $# -eq 2 ]] || fail "${FUNCNAME[0]}: bad number of arguments"
op=${1} op=${1}
vb=${2} vb=${2}
case ${op} in case ${op} in
-eq|-ne|-lt|-le|-gt|-ge) ;; -eq|-ne|-lt|-le|-gt|-ge) ;;
*) fail "${FUNCNAME}: invalid operator: ${op}" ;; *) fail "${FUNCNAME[0]}: invalid operator: ${op}" ;;
esac esac
_ver_compare "${va}" "${vb}" _ver_compare "${va}" "${vb}"
@ -171,7 +171,7 @@ function gentoo_ver_cmp_out() {
out_ref=0 out_ref=0
_ver_compare "${v1}" "${v2}" || out_ref=${?} _ver_compare "${v1}" "${v2}" || out_ref=${?}
case ${out_ref} in case ${out_ref} in
1|2|3) "${GV_LT}"|"${GV_EQ}"|"${GV_GT}")
return 0 return 0
;; ;;
*) *)

1
pkg_auto/impl/pkg_auto_lib.sh
View File

@ -2814,6 +2814,7 @@ function handle_gentoo_sync() {
local path in_ps category local path in_ps category
if [[ "${old_head}" != "${new_head}" ]]; then if [[ "${old_head}" != "${new_head}" ]]; then
while read -r path; do while read -r path; do
# shellcheck disable=SC2153 # PORTAGE_STABLE_SUFFIX is not a misspelling
if [[ ${path} != "${PORTAGE_STABLE_SUFFIX}/"* ]]; then if [[ ${path} != "${PORTAGE_STABLE_SUFFIX}/"* ]]; then
continue continue
fi fi