X-Git-Url: https://git.distorted.org.uk/~mdw/distorted-keys/blobdiff_plain/ae0eb8989b3100de7b410f0cbffbee48495b9591..28bb1ec395f56d0b6fe7d2904b5c59c7cbddab87:/keyfunc.sh.in

diff --git a/keyfunc.sh.in b/keyfunc.sh.in
index 6cba169..c8a6073 100644
--- a/keyfunc.sh.in
+++ b/keyfunc.sh.in
@@ -154,8 +154,14 @@ check () {
 
   validp=t
   case "$thing" in
-    *"$nl"*) validp=nil ;;
-    *) if ! expr >/dev/null "Q$thing" : "Q$ckpat\$"; then validp=nil; fi ;;
+    *"$nl"*)
+      validp=nil
+      ;;
+    *)
+      if ! expr >/dev/null "Q$thing" : "\(Q$ckpat\)\$"; then
+      validp=nil
+      fi
+      ;;
   esac
   case $validp in
     nil) echo >&2 "$quis: bad $ckwhat \`$thing'"; exit 1 ;;
@@ -431,7 +437,7 @@ $profile
 EOF
 
   ## Generate the key.
-  umask=$(umask); umask 077; >"$knub.new"; umask $umask
+  (umask 077; makenub >"$knub.new")
   k_generate "$kdir.new" "$knub.new"
   $hook "$kdir.new" "$knub.new"
 
@@ -621,14 +627,14 @@ recover () {
 
   rdir=$KEYS/recov/$recov/$inst
   if [ ! -f $rdir/$label.recov ]; then
-    echo >&2 "$quis: no blob for \`$label' under recovery key \`$recov/$inst'"
+    echo >&2 "$quis: recovery key \`$recov/$inst' has no blob for \`$label'"
     exit 1
   fi
   reqsafe
   tag=$recov.$inst
   nub=$SAFE/keys.reveal/$tag/nub
   if [ ! -f $nub ]; then
-    echo >&2 "$quis: current recovery key \`$recov/$inst' not revealed"
+    echo >&2 "$quis: recovery key \`$recov/$inst' not revealed"
     exit 1;
   fi
   mktmp
@@ -664,7 +670,7 @@ usage_err () { usage >&2; exit 1; }
 ### Subcommand handling.
 
 version () {
-  echo "$PACKAGE version $VERSION"
+  echo "$quis, $PACKAGE version $VERSION"
 }
 
 unset cmdargs
@@ -720,6 +726,7 @@ $cmds
 EOF
 	case $foundp in
 	  t)
+	    usage; echo
 	    eval help=\$help_$cmdname; echo "$help"
 	    ;;
 	  nil)