make sure all prompt messages are going to stderr

diff --git a/src/monkeysphere b/src/monkeysphere
index fd96f45e746d78ce09f8f76d3f14932152e47a25..371983f2fb82ac962fedb04475789d0e1389aa11 100755 (executable)
--- a/src/monkeysphere
+++ b/src/monkeysphere
@@ -122,7 +122,7 @@ check_gpg_authentication_subkey() {
        fi
        # if authentication key is valid, prompt to continue
        if [ "$validity" = 'u' ] ; then
-           echo "A valid authentication key already exists for primary key '$keyID'."
+           echo "A valid authentication key already exists for primary key '$keyID'." 1>&2
            if [ "$PROMPT" = "true" ] ; then
                read -p "Are you sure you would like to generate another one? (y/N) " OK; OK=${OK:N}
                if [ "${OK/y/Y}" != 'Y' ] ; then

diff --git a/src/share/mh/add_hostname b/src/share/mh/add_hostname
index ec741ee5a114f8eb99cfc3e99f15d6a202c91a18..b08d688a91f1230f983439259c2aaab9aabf4128 100644 (file)
--- a/src/share/mh/add_hostname
+++ b/src/share/mh/add_hostname
@@ -32,11 +32,9 @@ find_host_userid > /dev/null && \
     failure "Host userID '$userID' already exists."
 
 if [ "$PROMPT" = "true" ] ; then
-    cat <<EOF
-The following user ID will be added to the host key:
+    read -p "The following user ID will be added to the host key:
   $userID
-EOF
-    read -p "Are you sure you would like to add this user ID? (Y/n) " OK; OK=${OK:=Y}
+Are you sure you would like to add this user ID? (Y/n) " OK; OK=${OK:=Y}
     if [ "${OK/y/Y}" != 'Y' ] ; then
        failure "User ID not added."
     fi

diff --git a/src/share/mh/add_revoker b/src/share/mh/add_revoker
index 2ae531e82c15f08fb98af01e2cecb92982a18b0b..03ae56fe5374f435f19735feaacf483ed3113e05 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}
+       read -p "Are you sure you want to add the above key as a revoker
+of the host key? (Y/n) " OK; OK=${OK:-Y}
        if [ "${OK/y/Y}" != 'Y' ] ; then
            failure "revoker not added."
        fi

diff --git a/src/share/mh/revoke_hostname b/src/share/mh/revoke_hostname
index 12158287d47d490d045fb1530cb5fa46cf73e72d..2142af7dbeb424757b94d58516b33b6e12a927cc 100644 (file)
--- a/src/share/mh/revoke_hostname
+++ b/src/share/mh/revoke_hostname
@@ -43,11 +43,9 @@ uidIndex=$(find_host_userid) || \
     failure "No non-revoked user ID found matching '$userID'."
 
 if [ "$PROMPT" = "true" ] ; then
-    cat <<EOF
-The following host key user ID will be revoked:
+    read -p "The following host key user ID will be revoked:
   $userID
-EOF
-    read -p "Are you sure you would like to revoke this user ID? (Y/n) " OK; OK=${OK:=Y}
+Are you sure you would like to revoke this user ID? (Y/n) " OK; OK=${OK:=Y}
     if [ "${OK/y/Y}" != 'Y' ] ; then
        failure "User ID not revoked."
     fi