extern/bat-extras
1
0
Fork 0
mirror of https://github.com/eth-p/bat-extras.git synced 2025-02-07 20:59:12 +01:00
Code Issues Packages Projects Releases Wiki Activity

lib: Fix 'getargs' setting an empty string when no args are left

Browse Source
This commit is contained in:
Ethan P 2021-04-03 17:16:15 -07:00
parent e4e916c63b
commit 650845dee4
No known key found for this signature in database
GPG Key ID: 6963FD04F6CF35EA
2 changed files with 12 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
lib/opt.sh
View File

@ -61,7 +61,11 @@ getargs() {
eval "$2=(\"\${$2[@]}\" $(printf '%q ' "${_ARGV[@]:$_ARGV_INDEX}"))"
fi
else
eval "$1=($(printf '%q ' "${_ARGV[@]:$_ARGV_INDEX}"))"
if [[ "${_ARGV_INDEX}" -ne "$((_ARGV_LAST+1))" ]]; then
eval "$1=($(printf '%q ' "${_ARGV[@]:$_ARGV_INDEX}"))"
else
eval "$1=()"
fi
fi
}

8
test/suite/lib_opt.sh
View File

@ -413,7 +413,13 @@ test:fn_getargs() {
# Ensure getargs doesn't remove remaining arguments.
shiftopt
assert_opt_name "three"
assert_opt_name "three"
# Ensure it doesn't set an empty string.
args=(one two)
setargs
getargs args
assert_equal 0 "${#args[@]}"
}
test:fn_getargs_append() {