bryson/pacman
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

parse_options: accept multiple arguments

Browse source 
Allow command-line options to accept multiple arguments without
additional quoting by taking the list of arguments until one
starting with a "-" is reached.

The only current use of this is the --pkg option in makepkg.  This
allows (e.g.)

makepkg --pkg foo bar

and packages "foo" and "bar" will be built.

Signed-off-by: Allan McRae <allan@archlinux.org>
Signed-off-by: Dan McGee <dan@archlinux.org>
This commit is contained in:
Allan McRae 2011-07-05 20:14:20 +10:00 • committed by Dan McGee
parent 87ee38d8b3
commit bfd6d22be2
1 changed files with 23 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

30
scripts/library/parse_options.sh
View file

@ -20,15 +20,20 @@ parse_options() {
local needsargument=0 local needsargument=0
[[ ${match} = ${1:2}: ]] && needsargument=1 [[ ${match} = ${1:2}: ]] && needsargument=1
[[ ${match} = ${1:2}:: && -n $2 && ${2:0:1} != "-" ]] && needsargument=1 [[ ${match} = ${1:2}:: && -n $2 && ${2:0:1} != "-" ]] && needsargument=1
if (( ! needsargument )); then if (( ! needsargument )); then
printf ' %s' "$1" printf ' %s' "$1"
else else
if [[ -n $2 ]]; then if [[ -n $2 ]]; then
printf ' %s' "$1" printf ' %s ' "$1"
shift shift
printf " '%s'" "$1" printf "'%q" "$1"
while [[ -n $2 && ${2:0:1} != "-" ]]; do
shift
printf " %q" "$1"
done
printf "'"
else else
printf "@SCRIPTNAME@: $(gettext "option %s requires an argument\n")" "'$1'" >&2 printf "@SCRIPTNAME@: $(gettext "option %s requires an argument\n")" "'$1'" >&2
ret=1 ret=1
@ -55,13 +60,24 @@ parse_options() {
printf ' -%s' "${1:i:1}" printf ' -%s' "${1:i:1}"
else else
if [[ -n ${1:$i+1} ]]; then if [[ -n ${1:$i+1} ]]; then
printf ' -%s' "${1:i:1}" printf ' -%s ' "${1:i:1}"
printf " '%s'" "${1:$i+1}" printf "'%q" "${1:$i+1}"
while [[ -n $2 && ${2:0:1} != "-" ]]; do
shift
printf " %q" "$1"
done
printf "'"
else else
if [[ -n $2 ]]; then if [[ -n $2 ]]; then
printf ' -%s' "${1:i:1}" printf ' -%s ' "${1:i:1}"
shift shift
printf " '%s'" "${1}" printf "'%q" "$1"
while [[ -n $2 && ${2:0:1} != "-" ]]; do
shift
printf " %q" "$1"
done
printf "'"
else else
printf "@SCRIPTNAME@: $(gettext "option %s requires an argument\n")" "'-${1:i:1}'" >&2 printf "@SCRIPTNAME@: $(gettext "option %s requires an argument\n")" "'-${1:i:1}'" >&2
ret=1 ret=1