summaryrefslogtreecommitdiff
path: root/src/share/ma
diff options
context:
space:
mode:
authorJameson Graef Rollins <jrollins@finestructure.net>2009-07-11 16:26:26 -0400
committerJameson Graef Rollins <jrollins@finestructure.net>2009-07-11 16:26:26 -0400
commitf3a03d72bc9c01491fc1cfccdbcef353db058548 (patch)
tree3899986ed67cb62f568b100503160e788dc0788d /src/share/ma
parentba3ca3e10f4975510dfeedcb6dfe8e2374ca3097 (diff)
parenta2704823c7770bc8df9377116877fcca78c3ea12 (diff)
Merge commit 'mlcastle/master'
Diffstat (limited to 'src/share/ma')
-rw-r--r--src/share/ma/add_certifier4
-rw-r--r--src/share/ma/remove_certifier3
2 files changed, 4 insertions, 3 deletions
diff --git a/src/share/ma/add_certifier b/src/share/ma/add_certifier
index 402da08..1601997 100644
--- a/src/share/ma/add_certifier
+++ b/src/share/ma/add_certifier
@@ -136,8 +136,8 @@ EOF
gpg_sphere "--fingerprint 0x${fingerprint}!"
if [ "$PROMPT" = "true" ] ; then
- echo "Are you sure you want to add the above key as a certifier"
- read -p "of users on this system? (Y/n) " OK; OK=${OK:-Y}
+ 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
failure "Identity certifier not added."
fi
diff --git a/src/share/ma/remove_certifier b/src/share/ma/remove_certifier
index 6c90358..79f1cda 100644
--- a/src/share/ma/remove_certifier
+++ b/src/share/ma/remove_certifier
@@ -27,7 +27,8 @@ fi
gpg_core --list-key --fingerprint "0x${keyID}!" || failure
if [ "$PROMPT" = "true" ] ; then
- read -p "Really remove the above listed identity certifier? (Y/n) " OK; OK=${OK:-Y}
+ printf "Really remove the above listed identity certifier? (Y/n) " >&2
+ read OK; OK=${OK:-Y}
if [ "${OK/y/Y}" != 'Y' ] ; then
failure "Identity certifier not removed."
fi