tweak/cleanup some of the prompts.

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

diff --git a/src/share/mh/revoke_hostname b/src/share/mh/revoke_hostname
index 940b5f462f2ef7694a1d772e9aee2992d5bb3d54..12158287d47d490d045fb1530cb5fa46cf73e72d 100644 (file)
--- a/src/share/mh/revoke_hostname
+++ b/src/share/mh/revoke_hostname
@@ -28,9 +28,9 @@ if [ -z "$1" ] ; then
 fi
 
 echo "WARNING: There is a known bug in this function."
-echo "This function has been known to occasionally revoke the wrong user ID."
+echo "This function has been known to occasionally revoke the wrong hostname."
 echo "Please see the following bug report for more information:"
-echo "http://web.monkeysphere.info/bugs/revoke-hostname-revoking-wrong-userid/"
+echo "https://labs.riseup.net/code/issues/show/422"
 read -p "Are you sure you would like to proceed? (y/N) " OK; OK=${OK:=N}
 if [ ${OK/y/Y} != 'Y' ] ; then
     failure "aborting."
@@ -42,11 +42,17 @@ userID="ssh://${1}"
 uidIndex=$(find_host_userid) || \
     failure "No non-revoked user ID found matching '$userID'."
 
-echo "The following host key user ID will be revoked:"
-echo "  $userID"
-read -p "Are you sure you would like to revoke this user ID? (y/N) " OK; OK=${OK:=N}
-if [ ${OK/y/Y} != 'Y' ] ; then
-    failure "User ID not revoked."
+if [ "$PROMPT" = "true" ] ; then
+    cat <<EOF
+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}
+    if [ "${OK/y/Y}" != 'Y' ] ; then
+       failure "User ID not revoked."
+    fi
+else
+    log debug "revoking user ID without prompting."
 fi
 
 # edit-key script command to revoke user ID
@@ -65,6 +71,8 @@ EOF
 # execute edit-key script
 if echo "$revuidCommand" | gpg_host_edit ; then
 
+    update_gpg_pub_file
+
     show_key
 
     echo