projects
/
monkeysphere.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge commit 'jrollins/master'
[monkeysphere.git]
/
src
/
share
/
mh
/
add_revoker
diff --git
a/src/share/mh/add_revoker
b/src/share/mh/add_revoker
index b4113df309fe639f1e4282d343b2faf37859dfb8..21dc0bb11a7191674d9b48986c0a289fe61014cf 100644
(file)
--- a/
src/share/mh/add_revoker
+++ b/
src/share/mh/add_revoker
@@
-53,14
+53,14
@@
if [ -f "$keyID" ] ; then
fi
else
# create a temporary directory for storing the downloaded key
fi
else
# create a temporary directory for storing the downloaded key
- TMPLOC=$(m
ktemp -d "${MHTMPDIR}"/tmp.XXXXXXXXXX
) || failure "Could not create temporary directory!"
+ TMPLOC=$(m
smktempdir
) || failure "Could not create temporary directory!"
# download the key from the keyserver as the monkeysphere user
su_monkeysphere_user \
# download the key from the keyserver as the monkeysphere user
su_monkeysphere_user \
- "GNUPGHOME=$TMPLOC gpg --keyserver $KEYSERVER --recv-key 0x${keyID}!"
+ "GNUPGHOME=$TMPLOC gpg --
quiet --
keyserver $KEYSERVER --recv-key 0x${keyID}!"
# export the new key to the host keyring
# export the new key to the host keyring
- su_monkeysphere_user "GNUPGHOME=$TMPLOC gpg --export 0x${keyID}!" \
+ su_monkeysphere_user "GNUPGHOME=$TMPLOC gpg --
quiet --
export 0x${keyID}!" \
| gpg_host --import
fi
| gpg_host --import
fi
@@
-79,7
+79,7
@@
gpg_host --fingerprint "0x${fingerprint}!"
if [ "$PROMPT" = "true" ] ; then
echo "Are you sure you want to add the above key as a"
if [ "$PROMPT" = "true" ] ; then
echo "Are you sure you want to add the above key as a"
- read -p "revoker of the host key? (
y/N) " OK; OK=${OK:-N
}
+ read -p "revoker of the host key? (
Y/n) " OK; OK=${OK:-Y
}
if [ "${OK/y/Y}" != 'Y' ] ; then
failure "revoker not added."
fi
if [ "${OK/y/Y}" != 'Y' ] ; then
failure "revoker not added."
fi