canonicalize prompting to prompt if MONKEYSPHERE_PROMPT != 'false'

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

diff --git a/src/share/mh/publish_key b/src/share/mh/publish_key
index 37b8a72628ad741bff5e50e380495b6aadb47be6..f1c17234f819477b74e272bb1c37fac493b4e6b7 100644 (file)
--- a/src/share/mh/publish_key
+++ b/src/share/mh/publish_key
@@ -8,37 +8,41 @@
 # Jamie McClelland <jm@mayfirst.org>
 # Daniel Kahn Gillmor <dkg@fifthhorseman.net>
 #
-# They are Copyright 2008-2009, and are all released under the GPL, version 3
-# or later.
+# They are Copyright 2008-2010, and are all released under the GPL,
+# version 3 or later.
 
-# publish server key to keyserver
+# publish keys to keyserver
 
 publish_key() {
 
+local keyID="$1"
 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
+if [ "$PROMPT" != "false" ] ; then
+    printf "Really publish key '$keyID' to $KEYSERVER? (Y/n) " >&2
+    read OK; OK=${OK:=Y}
+    if [ "${OK/y/Y}" != 'Y' ] ; then
        failure "key not published."
     fi
 else
-    log debug "publishing key without prompting."
+    log debug "publishing key '$keyID' without prompting."
 fi
 
 # create a temporary gnupg directory from which to publish the key
 export GNUPGHOME=$(msmktempdir)
+chmod 0700 "$GNUPGHOME"
+chown "$MONKEYSPHERE_USER":"$MONKEYSPHERE_GROUP" "$GNUPGHOME"
 
 # trap to remove tmp dir if break
 trap "rm -rf $GNUPGHOME" EXIT
 
-# import the host key into the tmp dir
+# import the key into the tmp dir
 su_monkeysphere_user \
     "gpg --quiet --import" <"$HOST_KEY_FILE"
 
-# publish host key
+# publish key
 su_monkeysphere_user \
-    "gpg --keyserver $KEYSERVER --send-keys '0x${HOST_FINGERPRINT}!'"
+    "gpg --keyserver $KEYSERVER --send-keys '0x${keyID}!'"
 
 # remove the tmp file
 trap - EXIT