tweak some of the prompting, to change defaults, and add PROMPT usage where missing

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

diff --git a/src/share/mh/publish_key b/src/share/mh/publish_key
index b433ad726195554e454dd030ddf6a4256b3a7c99..05faa0be25e55b9a7e1ea7ce9c2bdda00370a09e 100644 (file)
--- a/src/share/mh/publish_key
+++ b/src/share/mh/publish_key
@@ -18,8 +18,8 @@ publish_key() {
 local GNUPGHOME
 
 if [ "$PROMPT" = "true" ] ; then
-    read -p "Really publish host key to $KEYSERVER? (y/N) " OK; OK=${OK:=N}
-    if [ ${OK/y/Y} != 'Y' ] ; then
+    read -p "Really publish host key to $KEYSERVER? (Y/n) " OK; OK=${OK:=Y}
+    if [ "${OK/y/Y}" != 'Y' ] ; then
        failure "key not published."
     fi
 else
@@ -27,7 +27,7 @@ else
 fi
 
 # create a temporary gnupg directory from which to publish the key
-export GNUPGHOME=$(mktemp -d)
+export GNUPGHOME=$(msmktempdir)
 
 # trap to remove tmp dir if break
 trap "rm -rf $GNUPGHOME" EXIT