Skip to content

Add handling of "--" #10

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
K-Ko wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Add handling of "--" #10

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
23 changes: 17 additions & 6 deletions optparse.bash
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -59,14 +59,18 @@ function optparse.define(){
# build OPTIONS and help
optparse_usage="${optparse_usage}#NL#TB${short} $(printf "%-25s %s" "${long}:" "${desc}")"
if [ "$default" != "" ]; then
optparse_usage="${optparse_usage} [default:$default]"
if [ "$val" != "\$OPTARG" ]; then
optparse_usage="${optparse_usage} [flag]"
else
optparse_usage="${optparse_usage} [default:$default]"
fi
fi
optparse_contractions="${optparse_contractions}#NL#TB#TB${long})#NL#TB#TB#TBparams=\"\$params ${short}\";;"
if [ "$default" != "" ]; then
optparse_defaults="${optparse_defaults}#NL${variable}=${default}"
fi
optparse_arguments_string="${optparse_arguments_string}${shortname}"
if [ "$val" = "\$OPTARG" ]; then
if [ "$val" == "\$OPTARG" ]; then
optparse_arguments_string="${optparse_arguments_string}:"
fi
optparse_process="${optparse_process}#NL#TB#TB${shortname})#NL#TB#TB#TB${variable}=\"$val\";;"
Expand All @@ -82,12 +86,12 @@ function optparse.build(){
cat << EOF > $build_file
function usage(){
cat << XXX
usage: \$0 [OPTIONS]
usage: \$0 [OPTIONS] \$ARGUMENTS

OPTIONS:
$optparse_usage

-? --help : usage
-? -h --help: usage

XXX
}
Expand All @@ -100,11 +104,15 @@ while [ \$# -ne 0 ]; do

case "\$param" in
$optparse_contractions
"-?"|--help)
"-?"|-h|--help)
usage
exit 0;;
*)
if [[ "\$param" == --* ]]; then
if [[ "\$param" == -- ]]; then
# getopts will handle the "--" correct and stops parsing
params="\$params -- \$@"
break
elif [[ "\$param" == --* ]]; then
echo -e "Unrecognized long option: \$param"
usage
exit 1
Expand Down Expand Up @@ -132,6 +140,9 @@ while getopts "$optparse_arguments_string" option; do
esac
done

# Shift out all args parsed by getopts
shift \$((\$OPTIND - 1))

# Clean up after self
rm $build_file

Expand Down