get rid of eval (use readarray)

This commit is contained in:
fatalerrors
2026-07-09 18:17:53 +02:00
parent c1ea14e145
commit 99dc9a4ef5
15 changed files with 130 additions and 46 deletions

View File

@@ -189,7 +189,9 @@ utaz()
disp E "Invalid options, use \"utaz --help\" to display usage." disp E "Invalid options, use \"utaz --help\" to display usage."
return 1 return 1
fi fi
eval set -- "$PARSED" local -a _pargs=()
readarray -td '' _pargs < <(printf '%s' "$PARSED" | xargs printf '%s\0')
set -- "${_pargs[@]}"
while true; do while true; do
case "$1" in case "$1" in
-h|--help) -h|--help)
@@ -599,7 +601,9 @@ taz()
disp E "Invalid options, use \"taz --help\" to display usage." disp E "Invalid options, use \"taz --help\" to display usage."
return 1 return 1
fi fi
eval set -- "$PARSED" local -a _pargs=()
readarray -td '' _pargs < <(printf '%s' "$PARSED" | xargs printf '%s\0')
set -- "${_pargs[@]}"
local compforms=() local compforms=()
while true; do while true; do
case "$1" in case "$1" in

View File

@@ -177,7 +177,9 @@ conf_dump()
disp E "Invalid options, use \"conf_dump --help\" to display usage." disp E "Invalid options, use \"conf_dump --help\" to display usage."
return 1 return 1
fi fi
eval set -- "$PARSED" local -a _pargs=()
readarray -td '' _pargs < <(printf '%s' "$PARSED" | xargs printf '%s\0')
set -- "${_pargs[@]}"
while true; do while true; do
case "$1" in case "$1" in

View File

@@ -73,7 +73,9 @@ settrace()
disp E "Invalid options, use \"settrace --help\" to display usage." disp E "Invalid options, use \"settrace --help\" to display usage."
return 1 return 1
fi fi
eval set -- "$PARSED" local -a _pargs=()
readarray -td '' _pargs < <(printf '%s' "$PARSED" | xargs printf '%s\0')
set -- "${_pargs[@]}"
# First pass: gather the requested action and flags. --on, --off and # First pass: gather the requested action and flags. --on, --off and
# --status are mutually exclusive; --force only modifies --on. # --status are mutually exclusive; --force only modifies --on.

View File

@@ -595,7 +595,9 @@ mdcat()
return 1 return 1
fi fi
eval set -- "$PARSED" local -a _pargs=()
readarray -td '' _pargs < <(printf '%s' "$PARSED" | xargs printf '%s\0')
set -- "${_pargs[@]}"
while true; do while true; do
case "$1" in case "$1" in
-h|--help) -h|--help)

View File

@@ -49,7 +49,9 @@ expandlist()
disp E "Invalid options, use \"expandlist --help\" to display usage." disp E "Invalid options, use \"expandlist --help\" to display usage."
return 1 return 1
fi fi
eval set -- "$PARSED" local -a _pargs=()
readarray -td '' _pargs < <(printf '%s' "$PARSED" | xargs printf '%s\0')
set -- "${_pargs[@]}"
while true; do while true; do
case "$1" in case "$1" in
@@ -138,7 +140,9 @@ clean()
return 1 return 1
fi fi
eval set -- "$PARSED" local -a _pargs=()
readarray -td '' _pargs < <(printf '%s' "$PARSED" | xargs printf '%s\0')
set -- "${_pargs[@]}"
while true; do while true; do
case "$1" in case "$1" in
@@ -264,7 +268,9 @@ rmspc()
disp E "Invalid options, use \"rmspc --help\" to display usage." disp E "Invalid options, use \"rmspc --help\" to display usage."
return 1 return 1
fi fi
eval set -- "$PARSED" local -a _pargs=()
readarray -td '' _pargs < <(printf '%s' "$PARSED" | xargs printf '%s\0')
set -- "${_pargs[@]}"
while true; do while true; do
case "$1" in case "$1" in
@@ -388,7 +394,9 @@ file_stats()
disp E "Invalid options, use \"file_stats --help\" to display usage." disp E "Invalid options, use \"file_stats --help\" to display usage."
return 1 return 1
fi fi
eval set -- "$PARSED" local -a _pargs=()
readarray -td '' _pargs < <(printf '%s' "$PARSED" | xargs printf '%s\0')
set -- "${_pargs[@]}"
while true; do while true; do
case "$1" in case "$1" in
@@ -616,7 +624,9 @@ findbig()
disp E "Invalid options, use \"findbig --help\" to display usage." disp E "Invalid options, use \"findbig --help\" to display usage."
return 1 return 1
fi fi
eval set -- "$PARSED" local -a _pargs=()
readarray -td '' _pargs < <(printf '%s' "$PARSED" | xargs printf '%s\0')
set -- "${_pargs[@]}"
while true; do while true; do
case "$1" in case "$1" in
@@ -721,7 +731,9 @@ findzero()
disp E "Invalid options, use \"findzero --help\" to display usage." disp E "Invalid options, use \"findzero --help\" to display usage."
return 1 return 1
fi fi
eval set -- "$PARSED" local -a _pargs=()
readarray -td '' _pargs < <(printf '%s' "$PARSED" | xargs printf '%s\0')
set -- "${_pargs[@]}"
while true; do while true; do
case "$1" in case "$1" in
@@ -819,7 +831,9 @@ finddead()
disp E "Invalid options, use \"finddead --help\" to display usage." disp E "Invalid options, use \"finddead --help\" to display usage."
return 1 return 1
fi fi
eval set -- "$PARSED" local -a _pargs=()
readarray -td '' _pargs < <(printf '%s' "$PARSED" | xargs printf '%s\0')
set -- "${_pargs[@]}"
while true; do while true; do
case "$1" in case "$1" in

View File

@@ -55,7 +55,9 @@ busy()
disp E "Invalid options, use \"busy --help\" to display usage." disp E "Invalid options, use \"busy --help\" to display usage."
return 1 return 1
fi fi
eval set -- "$PARSED" local -a _pargs=()
readarray -td '' _pargs < <(printf '%s' "$PARSED" | xargs printf '%s\0')
set -- "${_pargs[@]}"
while true; do while true; do
case "$1" in case "$1" in
@@ -142,7 +144,9 @@ fake_compile()
disp E "Invalid options, use \"fake_compile --help\" to display usage." disp E "Invalid options, use \"fake_compile --help\" to display usage."
return 1 return 1
fi fi
eval set -- "$PARSED" local -a _pargs=()
readarray -td '' _pargs < <(printf '%s' "$PARSED" | xargs printf '%s\0')
set -- "${_pargs[@]}"
while true; do while true; do
case "$1" in case "$1" in
@@ -325,7 +329,9 @@ hack()
disp E "Invalid options, use \"hack --help\" to display usage." disp E "Invalid options, use \"hack --help\" to display usage."
return 1 return 1
fi fi
eval set -- "$PARSED" local -a _pargs=()
readarray -td '' _pargs < <(printf '%s' "$PARSED" | xargs printf '%s\0')
set -- "${_pargs[@]}"
while true; do while true; do
case "$1" in case "$1" in

View File

@@ -95,7 +95,9 @@ gst()
return 1 return 1
fi fi
eval set -- "$PARSED" local -a _pargs=()
readarray -td '' _pargs < <(printf '%s' "$PARSED" | xargs printf '%s\0')
set -- "${_pargs[@]}"
while true; do while true; do
case "$1" in case "$1" in
-h|--help) -h|--help)
@@ -142,7 +144,9 @@ ggraph()
return 1 return 1
fi fi
eval set -- "$PARSED" local -a _pargs=()
readarray -td '' _pargs < <(printf '%s' "$PARSED" | xargs printf '%s\0')
set -- "${_pargs[@]}"
local limit=30 local limit=30
while true; do while true; do
case "$1" in case "$1" in
@@ -193,7 +197,9 @@ gsync()
return 1 return 1
fi fi
eval set -- "$PARSED" local -a _pargs=()
readarray -td '' _pargs < <(printf '%s' "$PARSED" | xargs printf '%s\0')
set -- "${_pargs[@]}"
while true; do while true; do
case "$1" in case "$1" in
-h|--help) -h|--help)
@@ -248,7 +254,9 @@ gacp()
return 1 return 1
fi fi
eval set -- "$PARSED" local -a _pargs=()
readarray -td '' _pargs < <(printf '%s' "$PARSED" | xargs printf '%s\0')
set -- "${_pargs[@]}"
local msg="" auto_add=0 local msg="" auto_add=0
case "${GIT_GACP_AUTO_ADD,,}" in case "${GIT_GACP_AUTO_ADD,,}" in
1|true|yes|on) auto_add=1 ;; 1|true|yes|on) auto_add=1 ;;
@@ -366,7 +374,9 @@ greset()
return 1 return 1
fi fi
eval set -- "$PARSED" local -a _pargs=()
readarray -td '' _pargs < <(printf '%s' "$PARSED" | xargs printf '%s\0')
set -- "${_pargs[@]}"
local clean_ignored=0 local clean_ignored=0
while true; do while true; do
case "$1" in case "$1" in
@@ -482,7 +492,9 @@ gwip()
return 1 return 1
fi fi
eval set -- "$PARSED" local -a _pargs=()
readarray -td '' _pargs < <(printf '%s' "$PARSED" | xargs printf '%s\0')
set -- "${_pargs[@]}"
while true; do while true; do
case "$1" in case "$1" in
-h|--help) -h|--help)
@@ -525,9 +537,9 @@ export -f gwip
# (git branch --merged). # (git branch --merged).
# Deep mode (-D/--deep): additionally deletes branches whose tracking remote # Deep mode (-D/--deep): additionally deletes branches whose tracking remote
# has disappeared (remote pruned after a merge request / pull request merge). # has disappeared (remote pruned after a merge request / pull request merge).
# Those branches are detected via `git fetch --prune` + remote-tracking gone. # Those branches are detected via 'git fetch --prune' + remote-tracking gone.
# This is the common case when the MR was merged upstream and the remote # This is the common case when the MR was merged upstream and the remote
# branch was deleted by the forge. Deletion uses `git branch -D` (force) # branch was deleted by the forge. Deletion uses 'git branch -D' (force)
# because the local branch has no merged ancestor that git can verify locally. # because the local branch has no merged ancestor that git can verify locally.
gprune() gprune()
{ {
@@ -539,7 +551,9 @@ gprune()
return 1 return 1
fi fi
eval set -- "$PARSED" local -a _pargs=()
readarray -td '' _pargs < <(printf '%s' "$PARSED" | xargs printf '%s\0')
set -- "${_pargs[@]}"
while true; do while true; do
case "$1" in case "$1" in
-h|--help) -h|--help)
@@ -598,10 +612,12 @@ gprune()
[[ $b == "$current" ]] && continue [[ $b == "$current" ]] && continue
[[ $b == "$base" ]] && continue [[ $b == "$base" ]] && continue
[[ $b == "master" || $b == "main" || $b == "develop" || $b == "dev" ]] && continue [[ $b == "master" || $b == "main" || $b == "develop" || $b == "dev" ]] && continue
# Detect a gone upstream without relying on localized "gone]" text: # Detect a gone upstream without relying on localized "gone]" text:
# resolve the branch's upstream, then check its remote-tracking ref. # resolve the branch's upstream, then check its remote-tracking ref.
upstream=$(git rev-parse --abbrev-ref "${b}@{upstream}" 2>/dev/null) || true upstream=$(git rev-parse --abbrev-ref "${b}@{upstream}" 2>/dev/null) || true
[[ -z "$upstream" ]] && continue # no tracking branch at all — skip [[ -z "$upstream" ]] && continue # no tracking branch at all — skip
# If the remote-tracking ref still exists, the upstream is not gone. # If the remote-tracking ref still exists, the upstream is not gone.
git show-ref --verify --quiet "refs/remotes/$upstream" 2>/dev/null && continue git show-ref --verify --quiet "refs/remotes/$upstream" 2>/dev/null && continue
sha=$(git rev-parse --short "$b" 2>/dev/null) sha=$(git rev-parse --short "$b" 2>/dev/null)
@@ -631,7 +647,9 @@ groot()
return 1 return 1
fi fi
eval set -- "$PARSED" local -a _pargs=()
readarray -td '' _pargs < <(printf '%s' "$PARSED" | xargs printf '%s\0')
set -- "${_pargs[@]}"
local do_go=0 local do_go=0
while true; do while true; do
case "$1" in case "$1" in

View File

@@ -50,7 +50,9 @@ ver()
return 1 return 1
fi fi
eval set -- "$PARSED" local -a _pargs=()
readarray -td '' _pargs < <(printf '%s' "$PARSED" | xargs printf '%s\0')
set -- "${_pargs[@]}"
while true; do while true; do
case "$1" in case "$1" in
-h|--help) -h|--help)
@@ -90,7 +92,9 @@ meteo()
disp E "Invalid options, use \"meteo --help\" to display usage." disp E "Invalid options, use \"meteo --help\" to display usage."
return 1 return 1
fi fi
eval set -- "$PARSED" local -a _pargs=()
readarray -td '' _pargs < <(printf '%s' "$PARSED" | xargs printf '%s\0')
set -- "${_pargs[@]}"
while true; do while true; do
case "$1" in case "$1" in
-h|--help) -h|--help)
@@ -146,7 +150,9 @@ pinfo()
disp E "Invalid options, use \"pinfo --help\" to display usage." disp E "Invalid options, use \"pinfo --help\" to display usage."
return 1 return 1
fi fi
eval set -- "$PARSED" local -a _pargs=()
readarray -td '' _pargs < <(printf '%s' "$PARSED" | xargs printf '%s\0')
set -- "${_pargs[@]}"
while true; do while true; do
case "$1" in case "$1" in
-h|--help) -h|--help)
@@ -311,7 +317,7 @@ pinfo()
# /proc/bus/pci/devices col 1 is busdevfn, col 2 is vendorID<<16|deviceID # /proc/bus/pci/devices col 1 is busdevfn, col 2 is vendorID<<16|deviceID
# The class 0x03xx is "Display controller / VGA compatible" # The class 0x03xx is "Display controller / VGA compatible"
case "$_pci_name" in case "$_pci_name" in
*VGA*|*Display*|*3D*|*GPU*|*Graphics*|*Radeon*|*GeForce*|*Intel*Iris*|*Intel*UHD*|*Intel*HD*Graphics*) *VGA*|*Display*|*3D*|*GPU*|*Graphics*|*Radeon*|*GeForce*|*Intel*Iris*|*Intel*UHD*|*Intel*HD*)
gpu_list+=("$_pci_name") gpu_list+=("$_pci_name")
;; ;;
esac esac
@@ -364,7 +370,9 @@ showinfo()
disp E "Invalid options, use \"showinfo --help\" to display usage." disp E "Invalid options, use \"showinfo --help\" to display usage."
return 1 return 1
fi fi
eval set -- "$PARSED" local -a _pargs=()
readarray -td '' _pargs < <(printf '%s' "$PARSED" | xargs printf '%s\0')
set -- "${_pargs[@]}"
while true; do while true; do
case "$1" in case "$1" in

View File

@@ -95,7 +95,9 @@ setlocale()
disp E "Invalid options, use \"setlocale --help\" to display usage." disp E "Invalid options, use \"setlocale --help\" to display usage."
return 1 return 1
fi fi
eval set -- "$PARSED" local -a _pargs=()
readarray -td '' _pargs < <(printf '%s' "$PARSED" | xargs printf '%s\0')
set -- "${_pargs[@]}"
while true; do while true; do
case "$1" in case "$1" in
-h|--help) -h|--help)

View File

@@ -133,7 +133,9 @@ pkgs()
disp E "Invalid options, use \"pkgs --help\" to display usage." disp E "Invalid options, use \"pkgs --help\" to display usage."
return 1 return 1
fi fi
eval set -- "$PARSED" local -a _pargs=()
readarray -td '' _pargs < <(printf '%s' "$PARSED" | xargs printf '%s\0')
set -- "${_pargs[@]}"
while true; do while true; do
case "$1" in case "$1" in
@@ -209,7 +211,9 @@ pkgf()
disp E "Invalid options, use \"pkgf --help\" to display usage." disp E "Invalid options, use \"pkgf --help\" to display usage."
return 1 return 1
fi fi
eval set -- "$PARSED" local -a _pargs=()
readarray -td '' _pargs < <(printf '%s' "$PARSED" | xargs printf '%s\0')
set -- "${_pargs[@]}"
while true; do while true; do
case "$1" in case "$1" in

View File

@@ -51,7 +51,9 @@ ppg()
return 1 return 1
fi fi
eval set -- "$PARSED" local -a _pargs=()
readarray -td '' _pargs < <(printf '%s' "$PARSED" | xargs printf '%s\0')
set -- "${_pargs[@]}"
while true; do while true; do
case "$1" in case "$1" in
-h|--help) -h|--help)
@@ -116,7 +118,9 @@ ppu()
return 1 return 1
fi fi
eval set -- "$PARSED" local -a _pargs=()
readarray -td '' _pargs < <(printf '%s' "$PARSED" | xargs printf '%s\0')
set -- "${_pargs[@]}"
while true; do while true; do
case "$1" in case "$1" in
-h|--help) -h|--help)
@@ -164,7 +168,9 @@ ppn()
return 1 return 1
fi fi
eval set -- "$PARSED" local -a _pargs=()
readarray -td '' _pargs < <(printf '%s' "$PARSED" | xargs printf '%s\0')
set -- "${_pargs[@]}"
while true; do while true; do
case "$1" in case "$1" in
-h|--help) -h|--help)
@@ -214,7 +220,9 @@ gpid()
return 1 return 1
fi fi
eval set -- "$PARSED" local -a _pargs=()
readarray -td '' _pargs < <(printf '%s' "$PARSED" | xargs printf '%s\0')
set -- "${_pargs[@]}"
while true; do while true; do
case "$1" in case "$1" in
-h|--help) -h|--help)
@@ -296,7 +304,9 @@ ku()
return 1 return 1
fi fi
eval set -- "$PARSED" local -a _pargs=()
readarray -td '' _pargs < <(printf '%s' "$PARSED" | xargs printf '%s\0')
set -- "${_pargs[@]}"
while true; do while true; do
case "$1" in case "$1" in
-h|--help) -h|--help)
@@ -421,7 +431,9 @@ kt()
return 1 return 1
fi fi
eval set -- "$PARSED" local -a _pargs=()
readarray -td '' _pargs < <(printf '%s' "$PARSED" | xargs printf '%s\0')
set -- "${_pargs[@]}"
while true; do while true; do
case "$1" in case "$1" in
-h|--help) -h|--help)

View File

@@ -69,7 +69,9 @@ genpwd()
-n 'genpwd' -- "$@") -n 'genpwd' -- "$@")
# shellcheck disable=SC2181 # getopt return code is checked immediately after # shellcheck disable=SC2181 # getopt return code is checked immediately after
if [[ $? -ne 0 ]]; then return 1; fi if [[ $? -ne 0 ]]; then return 1; fi
eval set -- "$PARSED" local -a _pargs=()
readarray -td '' _pargs < <(printf '%s' "$PARSED" | xargs printf '%s\0')
set -- "${_pargs[@]}"
while true; do while true; do
case "$1" in case "$1" in

View File

@@ -597,7 +597,9 @@ rainbow()
local frame_sleep local frame_sleep
frame_sleep=$(_rain_normalize_speed "$_raw_speed") || frame_sleep=0.040 frame_sleep=$(_rain_normalize_speed "$_raw_speed") || frame_sleep=0.040
eval set -- "$PARSED" local -a _pargs=()
readarray -td '' _pargs < <(printf '%s' "$PARSED" | xargs printf '%s\0')
set -- "${_pargs[@]}"
while true; do while true; do
case "$1" in case "$1" in
-h|--help) -h|--help)

View File

@@ -48,7 +48,9 @@ rmhost()
PARSED=$(getopt -o ha --long help,all-users -n 'rmhost' -- "$@") PARSED=$(getopt -o ha --long help,all-users -n 'rmhost' -- "$@")
# shellcheck disable=SC2181 # getopt return code is checked immediately after # shellcheck disable=SC2181 # getopt return code is checked immediately after
if [[ $? -ne 0 ]]; then return 1; fi if [[ $? -ne 0 ]]; then return 1; fi
eval set -- "$PARSED" local -a _pargs=()
readarray -td '' _pargs < <(printf '%s' "$PARSED" | xargs printf '%s\0')
set -- "${_pargs[@]}"
while true; do while true; do
case "$1" in case "$1" in

View File

@@ -59,7 +59,9 @@ check_updates()
disp E "Invalid options, use \"check_updates --help\" to display usage." disp E "Invalid options, use \"check_updates --help\" to display usage."
return 2 return 2
fi fi
eval set -- "$PARSED" local -a _pargs=()
readarray -td '' _pargs < <(printf '%s' "$PARSED" | xargs printf '%s\0')
set -- "${_pargs[@]}"
while true; do while true; do
case "$1" in case "$1" in
@@ -139,7 +141,9 @@ profile_upgrade()
disp E "Invalid options, use \"profile_upgrade --help\" to display usage." disp E "Invalid options, use \"profile_upgrade --help\" to display usage."
return 2 return 2
fi fi
eval set -- "$PARSED" local -a _pargs=()
readarray -td '' _pargs < <(printf '%s' "$PARSED" | xargs printf '%s\0')
set -- "${_pargs[@]}"
while true; do while true; do
case "$1" in case "$1" in
-h|--help) -h|--help)