chiark
/
gitweb
/
~mdw
/
distorted-keys
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
shamir.in: Declare subcommands with decorator.
[distorted-keys]
/
keyfunc.sh.in
diff --git
a/keyfunc.sh.in
b/keyfunc.sh.in
index 98354d17bb2a49bf1b8f6a6e1b3d5518c4de2d8f..51cac57143e0ca24cb2789bf3f051b9b5f515c8d 100644
(file)
--- a/
keyfunc.sh.in
+++ b/
keyfunc.sh.in
@@
-154,8
+154,14
@@
check () {
validp=t
case "$thing" in
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 ;;
esac
case $validp in
nil) echo >&2 "$quis: bad $ckwhat \`$thing'"; exit 1 ;;
@@
-425,13
+431,13
@@
c_genkey () {
## Create directory structure and start writing metadata.
rm -rf "$kdir.new"
mkdir -m755 -p "$kdir.new"
## Create directory structure and start writing metadata.
rm -rf "$kdir.new"
mkdir -m755 -p "$kdir.new"
- case "$knub" in */*) mkdir -m7
00
-p "${knub%/*}" ;; esac
+ case "$knub" in */*) mkdir -m7
55
-p "${knub%/*}" ;; esac
cat >"$kdir.new/meta" <<EOF
$profile
EOF
## Generate the key.
cat >"$kdir.new/meta" <<EOF
$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"
k_generate "$kdir.new" "$knub.new"
$hook "$kdir.new" "$knub.new"
@@
-664,7
+670,7
@@
usage_err () { usage >&2; exit 1; }
### Subcommand handling.
version () {
### Subcommand handling.
version () {
- echo "$PACKAGE version $VERSION"
+ echo "$
quis, $
PACKAGE version $VERSION"
}
unset cmdargs
}
unset cmdargs
@@
-720,6
+726,7
@@
$cmds
EOF
case $foundp in
t)
EOF
case $foundp in
t)
+ usage; echo
eval help=\$help_$cmdname; echo "$help"
;;
nil)
eval help=\$help_$cmdname; echo "$help"
;;
nil)