X-Git-Url: https://codewiz.org/gitweb?a=blobdiff_plain;ds=sidebyside;f=src%2Fmonkeysphere-host;h=9e4a8c4e4723ac891bc2e5cbbbe5b808b5e29f1c;hb=183d64eed7eb9724ca6c96f656cb02f475158d0e;hp=0dba1f62ef787cdd322196e5804c622a4981b130;hpb=97c0b4f9ba18f9e09b430ece4f1b762958238f31;p=monkeysphere.git

diff --git a/src/monkeysphere-host b/src/monkeysphere-host
index 0dba1f6..9e4a8c4 100755
--- a/src/monkeysphere-host
+++ b/src/monkeysphere-host
@@ -41,9 +41,6 @@ DATE=$(date -u '+%FT%T')
 # unset some environment variables that could screw things up
 unset GREP_OPTIONS
 
-# default return code
-RETURN=0
-
 ########################################################################
 # FUNCTIONS
 ########################################################################
@@ -177,7 +174,7 @@ show_key() {
 
     # create the ssh key
     TMPSSH="$GNUPGHOME"/ssh_host_key_rsa_pub
-    openpgp2ssh <"$HOST_KEY_FILE" 2>/dev/null >"$TMPSSH"
+    gpg --export | openpgp2ssh 2>/dev/null >"$TMPSSH"
 
     # get the gpg fingerprint
     HOST_FINGERPRINT=$(gpg --quiet --list-keys --with-colons --with-fingerprint \
@@ -193,7 +190,7 @@ show_key() {
 
     # list revokers, if there are any
     revokers=$(gpg --list-keys --with-colons --fixed-list-mode \
-	| grep '^rvk:' | cut -d: -f10)
+	| awk -F: '/^rvk:/{ print $10 }' )
     if [ "$revokers" ] ; then
 	echo "The following keys are allowed to revoke this host key:"
 	for key in $revokers ; do
@@ -315,7 +312,7 @@ case $COMMAND in
 	;;
 
     'version'|'v')
-	echo "$VERSION"
+	version
 	;;
 
     '--help'|'help'|'-h'|'h'|'?')
@@ -327,5 +324,3 @@ case $COMMAND in
 Type '$PGRM help' for usage."
         ;;
 esac
-
-exit "$RETURN"