From 32ee4c7c5deb8300b64fa02775914ea4969d801f Mon Sep 17 00:00:00 2001
From: boyska <piuttosto@logorroici.org>
Date: Tue, 16 Aug 2011 20:44:18 +0200
Subject: [PATCH 1/2] If no subcmd use a default. tomb -h or -v works

---
 src/tomb | 11 +++++++++--
 1 file changed, 9 insertions(+), 2 deletions(-)

diff --git a/src/tomb b/src/tomb
index b82a96d..bf7e63c 100755
--- a/src/tomb
+++ b/src/tomb
@@ -1109,6 +1109,7 @@ main() {
     #       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)
     main_opts=(q -quiet=q D -debug=D h -help=h v -verbose=v)
+    subcommands_opts[__default]=""
     subcommands_opts[open]="n -nohook=n k: -key=k o: -mount-options=o"
     subcommands_opts[mount]=${subcommands_opts[open]}
     subcommands_opts[create]="s: -size=s"
@@ -1136,6 +1137,9 @@ main() {
     zparseopts -M -E -D -Adiscardme ${every_opts}
     unset discardme
     subcommand=$1
+    if [[ -z $subcommand ]]; then
+        subcommand="__default"
+    fi
     if [[ -z ${(k)subcommands_opts[$subcommand]} ]]; then #there's no such subcommand
         error "Subcommand '$subcommand' doesn't exist"
         exit 127
@@ -1169,8 +1173,10 @@ main() {
 	PARAM+=$arg
   done
   #first parameter actually is the subcommand: delete it and shift
-  PARAM[1]=()
-  shift
+  if [[ $subcommand != '__default' ]]; then
+      PARAM[1]=()
+      shift
+  fi
   ### End parsing command-specific options
 
   ### Set global options (useless, but for code retro-compatibility)
@@ -1213,6 +1219,7 @@ main() {
 	askpass) ask_password $CMD2 ;;
 	 mktemp) safe_dir ${CMD2} ;;
       translate) generate_translatable_strings ;;
+      __default) usage ;;
 	      *) error "command \"$CMD\" not recognized"
 		 act "try -h for help"
 		 return 1

From 582cce9f666fb2ed0b8f9f8c33477674ccfc5b10 Mon Sep 17 00:00:00 2001
From: boyska <piuttosto@logorroici.org>
Date: Tue, 16 Aug 2011 20:51:59 +0200
Subject: [PATCH 2/2] ./tomb -v works fine

Fixed the "--verbose" alias: it should have been --version
---
 src/tomb | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/src/tomb b/src/tomb
index bf7e63c..3adf88d 100755
--- a/src/tomb
+++ b/src/tomb
@@ -1108,7 +1108,7 @@ main() {
     #       I. usability; user expect that "-s" is "size
     #       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)
-    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[mount]=${subcommands_opts[open]}
@@ -1219,7 +1219,12 @@ main() {
 	askpass) ask_password $CMD2 ;;
 	 mktemp) safe_dir ${CMD2} ;;
       translate) generate_translatable_strings ;;
-      __default) usage ;;
+      __default)
+          if option_is_set -v; then
+            echo Tomb - $VERSION
+        else
+          usage
+      fi;;
 	      *) error "command \"$CMD\" not recognized"
 		 act "try -h for help"
 		 return 1