X-Git-Url: https://codewiz.org/gitweb?a=blobdiff_plain;f=src%2Fshare%2Fmh%2Frevoke_hostname;h=5dc327f02c8a65a97e1fa4dd4dae1289bb15bc85;hb=dfd67a14003fbfb4b1ba2269e7d47f4d0c44fcf8;hp=71b56ed2327fe936312eff438a45f29e283f96b8;hpb=d41fe28eb49e42d7773a223a43fd108913410c99;p=monkeysphere.git

diff --git a/src/share/mh/revoke_hostname b/src/share/mh/revoke_hostname
index 71b56ed..5dc327f 100644
--- a/src/share/mh/revoke_hostname
+++ b/src/share/mh/revoke_hostname
@@ -43,9 +43,9 @@ uidIndex=$(find_host_userid) || \
     failure "No non-revoked user ID found matching '$userID'."
 
 if [ "$PROMPT" = "true" ] ; then
-    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? (N/y) " OK; OK=${OK:=Y}
+    read -p "The following host key user ID will be revoked:
+  $userID
+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
@@ -54,17 +54,15 @@ else
 fi
 
 # edit-key script command to revoke user ID
-revuidCommand=$(cat <<EOF
-$uidIndex
+revuidCommand="$uidIndex
 revuid
 y
 4
 Hostname removed by monkeysphere-host: $DATE
 
 y
-save
-EOF
-    )	
+save"
+# end script
 
 # execute edit-key script
 if echo "$revuidCommand" | gpg_host_edit ; then