3 files changed, 9 insertions, 15 deletions
diff --git a/src/share/mh/add_hostname b/src/share/mh/add_hostname
index b08d688..36f174d 100644
--- a/src/share/mh/add_hostname
+++ b/src/share/mh/add_hostname
@@ -43,14 +43,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
diff --git a/src/share/mh/add_revoker b/src/share/mh/add_revoker
index 03ae56f..077b0d0 100644
--- a/src/share/mh/add_revoker
+++ b/src/share/mh/add_revoker
@@ -106,14 +106,12 @@ of the host key? (Y/n) " OK; OK=${OK:-Y}
 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..."
diff --git a/src/share/mh/revoke_hostname b/src/share/mh/revoke_hostname
index 2142af7..5dc327f 100644
--- a/src/share/mh/revoke_hostname
+++ b/src/share/mh/revoke_hostname
@@ -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