tomb

commit 44c08f73f20c37d95266beb099566e44bbc79670
parent 9c018fb04df33965505a038abfd4620a1bb527b0
Author: Jaromil <jaromil@dyne.org>
Date:   Thu, 16 Sep 2010 14:51:06 +0200

small fix to key path

Diffstat:
M
src/tomb
 | 
14
++++++++------

1 file changed, 8 insertions(+), 6 deletions(-)
diff --git a/src/tomb b/src/tomb
@@ -85,11 +85,6 @@ act ""
 func "invoked with args \"$*\" "
 func "running on `date`"
 
-id | grep root > /dev/null
-if [ $? != 0 ]; then
-    error "This program must be run as root to produce results"
-    exit 1
-fi
 
 OPTS=`getopt -o hvs:k: -n 'tomb' -- "$@"`
 
@@ -102,7 +97,7 @@ while true; do
 	    act "-h     print this help"
 	    act "-v     print out the version information for this tool"
 	    act "-s     size of the storage file when creating one (in MBytes)"
-	    act "-k     path key to be used for decryption (defaults in ~/.tomb)"
+	    act "-k     path to the key to use for decryption"
 	    act ""
             notice "Commands:"
 	    act "create     create a new encrypted storage FILE and keys"
@@ -126,11 +121,18 @@ BEGIN { license=0 }
     esac
 done
 
+
 if [ -z $CMD ]; then
     error "first argument missing, use -h for help"
     exit 0
 fi
 
+id | grep root > /dev/null
+if [ $? != 0 ]; then
+    error "This program must be run as root to produce results"
+    exit 1
+fi
+
 func "command: $CMD for file $FILE"
 
 tombdir=${HOME}/.tomb