Merge commit 'dkg/master'

[monkeysphere.git] / src / subcommands / mh / publish-key

diff --git a/src/subcommands/mh/publish-key b/src/subcommands/mh/publish-key
old mode 100755 (executable)
new mode 100644 (file)
index 792d858..6c69569
--- a/src/subcommands/mh/publish-key
+++ b/src/subcommands/mh/publish-key
@@ -1,17 +1,20 @@
-#!/usr/bin/env bash
+# -*-shell-script-*-
+# This should be sourced by bash (though we welcome changes to make it POSIX sh compliant)
 
 # Monkeysphere host publish-key subcommand
 #
 # The monkeysphere scripts are written by:
-# Jameson Rollins <jrollins@fifthhorseman.net>
+# Jameson Rollins <jrollins@finestructure.net>
 # Jamie McClelland <jm@mayfirst.org>
 # Daniel Kahn Gillmor <dkg@fifthhorseman.net>
 #
-# They are Copyright 2008, and are all released under the GPL, version 3
+# They are Copyright 2008-2009, and are all released under the GPL, version 3
 # or later.
 
 # publish server key to keyserver
 
+publish_key() {
+
 read -p "Really publish host key to $KEYSERVER? (y/N) " OK; OK=${OK:=N}
 if [ ${OK/y/Y} != 'Y' ] ; then
     failure "key not published."
@@ -22,3 +25,5 @@ fingerprint=$(fingerprint_server_key)
 
 # publish host key
 gpg_authentication "--keyserver $KEYSERVER --send-keys '0x${fingerprint}!'"
+
+}