SF.net SVN: safekeep: [296] safekeep/trunk

[<di...@us...>]

Revision: 296
          http://safekeep.svn.sourceforge.net/safekeep/?rev=296&view=rev
Author:   dimi
Date:     2007-01-25 20:09:05 -0800 (Thu, 25 Jan 2007)

Log Message:
-----------
Remove the short options for selecting the operation mode, since
they were polluting the namespace and they weren't all that useful:
  - the server mode is the defalt mode, no switch is required
  - the client mode should never be invoked manually
  - the keys mode benefits slighly from the additional clarity.
This should allow us in the future more freedom to add other
options with those names.

Modified Paths:
--------------
    safekeep/trunk/doc/safekeep.txt
    safekeep/trunk/safekeep

Modified: safekeep/trunk/doc/safekeep.txt
===================================================================
--- safekeep/trunk/doc/safekeep.txt	2007-01-26 03:56:40 UTC (rev 295)
+++ safekeep/trunk/doc/safekeep.txt	2007-01-26 04:09:05 UTC (rev 296)
@@ -7,11 +7,11 @@
 
 SYNOPSIS
 --------
-'safekeep' [-s] [-q] [-v] [-C file] [-e <email>] [-m <smtp>]
+'safekeep' [--server] [-q] [-v] [-C file] [-e <email>] [-m <smtp>]
 
-'safekeep' -c
+'safekeep' --client
 
-'safekeep' -k [-q] [-v] [--status|--print|--deploy] <clientid>*
+'safekeep' --keys [-q] [-v] [--status|--print|--deploy] <clientid>*
 
 'safekeep' -h | -V
 
@@ -45,15 +45,15 @@
 
 OPTIONS
 -------
--s, --server::
+--server::
 	Selects the server mode (default)
 
--c, --client::
+--client::
 	Selects the client mode. This should never be invoked manually, the
 	clients are started automatically by the server on the client machines
 	using SSH.
 
--k, --keys::
+--keys::
 	Selects the SSH key management mode
 
 -h, --help::

Modified: safekeep/trunk/safekeep
===================================================================
--- safekeep/trunk/safekeep	2007-01-26 03:56:40 UTC (rev 295)
+++ safekeep/trunk/safekeep	2007-01-26 04:09:05 UTC (rev 296)
@@ -735,14 +735,14 @@
 ######################################################################
 
 def usage():
-    print 'usage: %s [-s|--server] [common options] [server options]' % (sys.argv[0])
-    print '       %s [-c|--client] [common options]' % (sys.argv[0])
-    print '       %s [-k|--keys] [common options] [keys options] [clientid1 [clientid2] ...]' % (sys.argv[0])
+    print 'usage: %s [--server] [common options] [server options]' % (sys.argv[0])
+    print '       %s --client [common options]' % (sys.argv[0])
+    print '       %s --keys [common options] [keys options] [clientid1 [clientid2] ...]' % (sys.argv[0])
     print
     print 'mode selection (pick one):'
-    print '-s, --server        launch in server mode (default)'
-    print '-c, --client        launch in client mode'
-    print '-k, --keys          launch in keys management mode'
+    print '--server            launch in server mode (default)'
+    print '--client            launch in client mode'
+    print '--keys              launch in keys management mode'
     print
     print 'common options:'
     print '-h, --help          show this help message and exit'
@@ -762,7 +762,7 @@
 
 def main():
     try:
-        opts, args = getopt.getopt(sys.argv[1:], 'C:e:hkm:scqvV',
+        opts, args = getopt.getopt(sys.argv[1:], 'C:e:hm:qvV',
                                    [ 'cfg=', 'client', 'clientid=', 'deploy',
                                      'email=', 'help', 'keys', 'print',
                                      'quiet', 'server', 'smtp=', 'status',
@@ -787,11 +787,11 @@
             sys.exit()
         elif o in ('-m', '--smtp'):
             smtp = a
-        elif o in ('-s', '--server'):
+        elif o in ('--server', ):
             mode = 'server'
-        elif o in ('-c', '--client'):
+        elif o in ('--client', ):
             mode = 'client'
-        elif o in ('-k', '--keys'):
+        elif o in ('--keys', ):
             mode = 'keys'
         elif o in ('--status', ):
             action = 'status'


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.