From: Eric S. Raymond <esr@thyrsus.com>
Date: Tue, 30 Dec 2003 17:15:58 +0000 (+0000)
Subject: Fix the help option.
X-Git-Tag: 1-1
X-Git-Url: http://thyrsus.com/gitweb/?a=commitdiff_plain;h=97303b53141c7c11b265e8aaa3fd82b3dd6a1770;p=ssh-installkeys.git

Fix the help option.
---

diff --git a/ssh-installkeys b/ssh-installkeys
index 92a16e4..4052940 100755
--- a/ssh-installkeys
+++ b/ssh-installkeys
@@ -1,23 +1,20 @@
 #!/usr/bin/env python
-"""ssh-installkeys -- prepare a remote account for ssh access
-
-This script tries to export ssh public keys to a specified site.  It will
+# ssh-installkeys -- prepare a remote account for ssh access
+"""This script tries to export ssh public keys to a specified site.  It will
 walk you through generating key pairs if it doesn't find any to export.
 It handles all the fiddly details like making sure local and remote
 permissions are correct, and tells you what it's doing if it has to change
 anything.
 
 Options:
-
 -h        Print usage summary and exit
 -c        Check local and remote configuration only, don't try to fix problems.
 -d        Delete remote .ssh configuration.
 -v        Report all commands sent to host and output received.
 
-Author: Eric S. Raymond <esr@thyrsus.com>
+Author: Eric S. Raymond <esr@thyrsus.com>"""
 
-$Id: ssh-installkeys,v 1.13 2003/12/04 00:44:45 esr Exp esr $
-"""
+# $Id: ssh-installkeys,v 1.14 2003/12/04 01:26:59 esr Exp esr $
 
 import os, sys, getopt, string, getpass, tempfile
 
@@ -66,7 +63,7 @@ A critical module was not found. Probably this OS does not support it.
 Currently pexpect is intended for UNIX operating systems (including OS-X)."""
 
 __version__ = '0.94'
-__revision__ = '$Revision: 1.13 $'
+__revision__ = '$Revision: 1.14 $'
 __all__ = ['ExceptionPexpect', 'EOF', 'TIMEOUT', 'spawn',
     '__version__', '__revision__']
 
@@ -634,7 +631,7 @@ def forcefile(session, file, command, checkonly=None):
 
 if __name__ == '__main__': 
     # Process options
-    (options, arguments) = getopt.getopt(sys.argv[1:], "cdh:v")
+    (options, arguments) = getopt.getopt(sys.argv[1:], "cdhv")
     check = 0
     verbose = 0
     delete = 0
@@ -645,7 +642,7 @@ if __name__ == '__main__':
         elif (switch == '-d'):
             delete = 1
 	elif (switch == '-h'):
-	    print __doc__ % login
+	    print __doc__
             raise SystemExit, 0
 	elif (switch == '-v'):
 	    verbose = 1