summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAllan McRae <allan@archlinux.org>2011-07-05 19:01:22 +1000
committerDan McGee <dan@archlinux.org>2011-07-05 10:22:25 -0500
commit87ee38d8b3d155310d13e2539e8647a98115df80 (patch)
tree426afd55653177fd56049c942bbddc84dfaeb662
parentddb8617d96675c8009d2aa99d6cc47e002339a51 (diff)
parse_options: implement optional arguments
This allows options specified with a trailing "::" to optionally take arguments. Signed-off-by: Allan McRae <allan@archlinux.org> Signed-off-by: Dan McGee <dan@archlinux.org>
-rw-r--r--scripts/library/parse_options.sh19
1 files changed, 15 insertions, 4 deletions
diff --git a/scripts/library/parse_options.sh b/scripts/library/parse_options.sh
index 96222301..49cbb60f 100644
--- a/scripts/library/parse_options.sh
+++ b/scripts/library/parse_options.sh
@@ -17,7 +17,12 @@ parse_options() {
fi
done
if [[ -n $match ]]; then
- if [[ ${1:2} = $match ]]; then
+ local needsargument=0
+
+ [[ ${match} = ${1:2}: ]] && needsargument=1
+ [[ ${match} = ${1:2}:: && -n $2 && ${2:0:1} != "-" ]] && needsargument=1
+
+ if (( ! needsargument )); then
printf ' %s' "$1"
else
if [[ -n $2 ]]; then
@@ -40,7 +45,15 @@ parse_options() {
elif [[ ${1:0:1} = '-' ]]; then
for ((i=1; i<${#1}; i++)); do
if [[ $short_options =~ ${1:i:1} ]]; then
- if [[ $short_options =~ ${1:i:1}: ]]; then
+ local needsargument=0
+
+ [[ $short_options =~ ${1:i:1}: && ! $short_options =~ ${1:i:1}:: ]] && needsargument=1
+ [[ $short_options =~ ${1:i:1}:: && \
+ ( -n ${1:$i+1} || ( -n $2 && ${2:0:1} != "-" ) ) ]] && needsargument=1
+
+ if (( ! needsargument )); then
+ printf ' -%s' "${1:i:1}"
+ else
if [[ -n ${1:$i+1} ]]; then
printf ' -%s' "${1:i:1}"
printf " '%s'" "${1:$i+1}"
@@ -55,8 +68,6 @@ parse_options() {
fi
fi
break
- else
- printf ' -%s' "${1:i:1}"
fi
else
echo "@SCRIPTNAME@: $(gettext "unrecognized option") '-${1:i:1}'" >&2