X-Git-Url: https://codewiz.org/gitweb?a=blobdiff_plain;f=src%2Fshare%2Fmh%2Fadd_hostname;h=9465d9635ac0bab68034c9ac29ef9356d7f80fd3;hb=8c9c2f20a9897605724cdf8ca89c21391bd621ed;hp=70bbec3f535acc9149a6c401cc5682d7a88c8d7b;hpb=8e3de9de8bc67b3e9e2c490a7e3142fde7742044;p=monkeysphere.git

diff --git a/src/share/mh/add_hostname b/src/share/mh/add_hostname
index 70bbec3..9465d96 100644
--- a/src/share/mh/add_hostname
+++ b/src/share/mh/add_hostname
@@ -32,10 +32,9 @@ find_host_userid > /dev/null && \
     failure "Host userID '$userID' already exists."
 
 if [ "$PROMPT" = "true" ] ; then
-    echo "The following user ID will be added to the host key:"
-    echo "  $userID"
-    read -p "Are you sure you would like to add this user ID? (y/N) " OK; OK=${OK:=N}
-    if [ ${OK/y/Y} != 'Y' ] ; then
+    printf "The following user ID will be added to the host key:\n  %s\nAre you sure you would like to add this user ID? (Y/n) " "$userID" >&2
+    read OK; OK=${OK:=Y}
+    if [ "${OK/y/Y}" != 'Y' ] ; then
 	failure "User ID not added."
     fi
 else
@@ -43,14 +42,12 @@ else
 fi
 
 # edit-key script command to add user ID
-adduidCommand=$(cat <<EOF
-adduid
+adduidCommand="adduid
 $userID
 
 
-save
-EOF
-)
+save"
+# end script
 
 # execute edit-key script
 if echo "$adduidCommand" | gpg_host_edit ; then