summaryrefslogtreecommitdiff
path: root/src/share/ma
diff options
context:
space:
mode:
authorJameson Rollins <jrollins@finestructure.net>2010-01-18 18:38:27 -0500
committerJameson Rollins <jrollins@finestructure.net>2010-01-18 18:38:27 -0500
commit7dbd6806e538ff8732dd87fcf20bfd8271464552 (patch)
tree7a564c4d55e5e6f9a2f74d1a22fa59aae03171a5 /src/share/ma
parent638a70f020f4ccda3deb15e5c697d384e0f705d7 (diff)
canonicalize prompting to prompt if MONKEYSPHERE_PROMPT != 'false'
Diffstat (limited to 'src/share/ma')
-rw-r--r--src/share/ma/add_certifier2
-rw-r--r--src/share/ma/remove_certifier2
2 files changed, 2 insertions, 2 deletions
diff --git a/src/share/ma/add_certifier b/src/share/ma/add_certifier
index 1601997..bd38190 100644
--- a/src/share/ma/add_certifier
+++ b/src/share/ma/add_certifier
@@ -135,7 +135,7 @@ EOF
log info "key found:"
gpg_sphere "--fingerprint 0x${fingerprint}!"
- if [ "$PROMPT" = "true" ] ; then
+ if [ "$PROMPT" != "false" ] ; then
printf "Are you sure you want to add the above key as a certifier\nof users on this system? (Y/n) " >&2
read OK; OK=${OK:-Y}
if [ "${OK/y/Y}" != 'Y' ] ; then
diff --git a/src/share/ma/remove_certifier b/src/share/ma/remove_certifier
index 79f1cda..51c7ee7 100644
--- a/src/share/ma/remove_certifier
+++ b/src/share/ma/remove_certifier
@@ -26,7 +26,7 @@ fi
# FIXME: should we be doing a fancier list_certifier output here?
gpg_core --list-key --fingerprint "0x${keyID}!" || failure
-if [ "$PROMPT" = "true" ] ; then
+if [ "$PROMPT" != "false" ] ; then
printf "Really remove the above listed identity certifier? (Y/n) " >&2
read OK; OK=${OK:-Y}
if [ "${OK/y/Y}" != 'Y' ] ; then