more replacement of read -p with printf; read (re #446)

[monkeysphere.git] / src / share / mh / add_revoker

diff --git a/src/share/mh/add_revoker b/src/share/mh/add_revoker
index 2ae531e82c15f08fb98af01e2cecb92982a18b0b..e58995b3cff28acbb35ef0341d1308d046db3e7c 100644 (file)
--- a/src/share/mh/add_revoker
+++ b/src/share/mh/add_revoker
@@ -90,8 +90,8 @@ EOF
     su_monkeysphere_user "GNUPGHOME=$tmpDir gpg --fingerprint 0x${fingerprint}!"
 
     if [ "$PROMPT" = "true" ] ; then
-       echo "Are you sure you want to add the above key as a revoker"
-       read -p "of the host key? (Y/n) " OK; OK=${OK:-Y}
+       printf "Are you sure you want to add the above key as a revoker\nof the host key? (Y/n) " >&2
+       read OK; OK=${OK:-Y}
        if [ "${OK/y/Y}" != 'Y' ] ; then
            failure "revoker not added."
        fi
@@ -106,14 +106,12 @@ EOF
 fi
 
 # edit-key script to add revoker
-addrevokerCommand=$(cat <<EOF
-addrevoker
+addrevokerCommand="addrevoker
 $fingerprint
 y
 save
-
-EOF
-    )
+"
+# end script
 
 # core ltsigns the newly imported revoker key
 log debug "executing add revoker script..."