projects
/
monkeysphere.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
tweak some of the prompting, to change defaults, and add PROMPT usage where missing
[monkeysphere.git]
/
src
/
share
/
ma
/
add_certifier
diff --git
a/src/share/ma/add_certifier
b/src/share/ma/add_certifier
index 28c229aec25de30120beca3b6c4ef0ed50f9f72a..9865e5c733f93fd196db29f5586a33d8306c05ab 100644
(file)
--- a/
src/share/ma/add_certifier
+++ b/
src/share/ma/add_certifier
@@
-36,8
+36,6
@@
local fingerprint
local ltsignCommand
local trustval
local ltsignCommand
local trustval
-PROMPT=true
-
# get options
while true ; do
case "$1" in
# get options
while true ; do
case "$1" in
@@
-53,10
+51,6
@@
while true ; do
depth="$2"
shift 2
;;
depth="$2"
shift 2
;;
- -y)
- PROMPT=false
- shift 1
- ;;
*)
if [ "$(echo "$1" | cut -c 1)" = '-' ] ; then
failure "Unknown option '$1'.
*)
if [ "$(echo "$1" | cut -c 1)" = '-' ] ; then
failure "Unknown option '$1'.
@@
-90,7
+84,8
@@
if [ -f "$keyID" ] ; then
# + failure 'could not read key from '\''/root/dkg.gpg'\'''
# + echo 'could not read key from '\''/root/dkg.gpg'\'''
# + failure 'could not read key from '\''/root/dkg.gpg'\'''
# + echo 'could not read key from '\''/root/dkg.gpg'\'''
- keyID=$(echo "$importinfo" | grep '^gpg: key ' | cut -f2 -d: | cut -f3 -d\ )
+ keyID=$(echo "$importinfo" | grep '^gpg: key ' | cut -f2 -d: | cut -f3 -d\ ) || \
+ failure "There were no gpg keys in the file $keyID."
if [ -z "$keyID" ] || [ $(echo "$keyID" | wc -l) -ne 1 ] ; then
failure "There was not exactly one gpg key in the file."
fi
if [ -z "$keyID" ] || [ $(echo "$keyID" | wc -l) -ne 1 ] ; then
failure "There was not exactly one gpg key in the file."
fi
@@
-114,9
+109,9
@@
fi
log info "key found:"
gpg_sphere "--fingerprint 0x${fingerprint}!"
log info "key found:"
gpg_sphere "--fingerprint 0x${fingerprint}!"
-if [ "$PROMPT" =
true
] ; then
+if [ "$PROMPT" =
"true"
] ; then
echo "Are you sure you want to add the above key as a"
echo "Are you sure you want to add the above key as a"
- read -p "certifier of users on this system? (
y/N) " OK; OK=${OK:-N
}
+ read -p "certifier of users on this system? (
Y/n) " OK; OK=${OK:-Y
}
if [ "${OK/y/Y}" != 'Y' ] ; then
failure "Identity certifier not added."
fi
if [ "${OK/y/Y}" != 'Y' ] ; then
failure "Identity certifier not added."
fi
@@
-157,7
+152,7
@@
EOF
# core ltsigns the newly imported certifier key
log debug "executing core ltsign script..."
if echo "$ltsignCommand" | \
# core ltsigns the newly imported certifier key
log debug "executing core ltsign script..."
if echo "$ltsignCommand" | \
- gpg_core --
quiet --
command-fd 0 --edit-key "0x${fingerprint}!" ; then
+ gpg_core --command-fd 0 --edit-key "0x${fingerprint}!" ; then
# transfer the new sigs back to the sphere keyring
gpg_core_sphere_sig_transfer
# transfer the new sigs back to the sphere keyring
gpg_core_sphere_sig_transfer