Llewellyn/Tomb
1
0
Fork 0
mirror of https://github.com/Llewellynvdm/Tomb.git synced 2024-11-20 03:30:59 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #22 from boyska/fix_nosubcmd

Browse Source 
tomb -h and tomb -v work as expected, without altering any other command
(it uses a __default subcommand if none is given)
This commit is contained in:
BoySka 2011-08-18 04:30:40 -07:00
commit 4d4d69cd4d
1 changed files with 15 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/tomb
View File

@ -1108,7 +1108,8 @@ main() {
# I. usability; user expect that "-s" is "size # I. usability; user expect that "-s" is "size
# II. Option parsing WILL EXPLODE if you do this kind of bad things # II. Option parsing WILL EXPLODE if you do this kind of bad things
# (it will say "option defined more than once, and he's right) # (it will say "option defined more than once, and he's right)
main_opts=(q -quiet=q D -debug=D h -help=h v -verbose=v) main_opts=(q -quiet=q D -debug=D h -help=h v -version=v)
subcommands_opts[__default]=""
subcommands_opts[open]="n -nohook=n k: -key=k o: -mount-options=o" subcommands_opts[open]="n -nohook=n k: -key=k o: -mount-options=o"
subcommands_opts[mount]=${subcommands_opts[open]} subcommands_opts[mount]=${subcommands_opts[open]}
subcommands_opts[create]="s: -size=s" subcommands_opts[create]="s: -size=s"
@ -1136,6 +1137,9 @@ main() {
zparseopts -M -E -D -Adiscardme ${every_opts} zparseopts -M -E -D -Adiscardme ${every_opts}
unset discardme unset discardme
subcommand=$1 subcommand=$1
if [[ -z $subcommand ]]; then
subcommand="__default"
fi
if [[ -z ${(k)subcommands_opts[$subcommand]} ]]; then #there's no such subcommand if [[ -z ${(k)subcommands_opts[$subcommand]} ]]; then #there's no such subcommand
error "Subcommand '$subcommand' doesn't exist" error "Subcommand '$subcommand' doesn't exist"
exit 127 exit 127
@ -1169,8 +1173,10 @@ main() {
PARAM+=$arg PARAM+=$arg
done done
#first parameter actually is the subcommand: delete it and shift #first parameter actually is the subcommand: delete it and shift
if [[ $subcommand != '__default' ]]; then
PARAM[1]=() PARAM[1]=()
shift shift
fi
### End parsing command-specific options ### End parsing command-specific options
### Set global options (useless, but for code retro-compatibility) ### Set global options (useless, but for code retro-compatibility)
@ -1213,6 +1219,12 @@ main() {
askpass) ask_password $CMD2 ;; askpass) ask_password $CMD2 ;;
mktemp) safe_dir ${CMD2} ;; mktemp) safe_dir ${CMD2} ;;
translate) generate_translatable_strings ;; translate) generate_translatable_strings ;;
__default)
if option_is_set -v; then
echo Tomb - $VERSION
else
usage
fi;;
*) error "command \"$CMD\" not recognized" *) error "command \"$CMD\" not recognized"
act "try -h for help" act "try -h for help"
return 1 return 1