X-Git-Url: https://codewiz.org/gitweb?a=blobdiff_plain;f=src%2Fsubcommands%2Fmh%2Fgen-key;h=aad213a3cbe272f2a9bc120d7451d99d607de3c3;hb=8001b4523c665ee7d9ded64cbdb7081b023b75c1;hp=9f260873362031dd638f48cbe2259f311caaef9b;hpb=0d36aebed69b154903e158a4c0f5cc8707cf5168;p=monkeysphere.git

diff --git a/src/subcommands/mh/gen-key b/src/subcommands/mh/gen-key
old mode 100755
new mode 100644
index 9f26087..aad213a
--- a/src/subcommands/mh/gen-key
+++ b/src/subcommands/mh/gen-key
@@ -1,14 +1,17 @@
-#!/usr/bin/env bash
+# -*-shell-script-*-
+# This should be sourced by bash (though we welcome changes to make it POSIX sh compliant)
 
 # Monkeysphere host gen-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
-# or later.
+# They are Copyright 2008-2009, and are all released under the GPL,
+# version 3 or later.
+
+gen_key() {
 
 local keyType="RSA"
 local keyLength="2048"
@@ -27,10 +30,6 @@ fingerprint_server_key >/dev/null \
 # get options
 while true ; do
 	case "$1" in
-	    -h|--hostname)
-		hostName="$2"
-		shift 2
-		;;
 	    -l|--length)
 		keyLength="$2"
 		shift 2
@@ -44,6 +43,8 @@ while true ; do
 		    failure "Unknown option '$1'.
 Type '$PGRM help' for usage."
 		fi
+		hostName="$1"
+		shift;
 		break
 		;;
 	esac
@@ -102,3 +103,5 @@ log info "SSH host public key in OpenPGP form: ${SYSDATADIR}/ssh_host_rsa_key.pu
 
 # show info about new key
 show_key
+
+}