cmd/margin: interpret the meaning of the margin bits.

[bup.git] / main.py

diff --git a/main.py b/main.py
index 0ac7abc64857133117028602184e6fa17f4ea8f6..38a5b0ae5ec6bd56ed50f6459fe945484005bf8c 100755 (executable)
--- a/main.py
+++ b/main.py
@@ -1,5 +1,4 @@
 #!/usr/bin/env python
-
 import sys, os, subprocess, signal, getopt
 
 argv = sys.argv
@@ -13,36 +12,20 @@ if os.path.exists("%s/lib/bup/cmd/." % exeprefix):
     # eg. /usr/bin/bup means /usr/lib/bup/... is where our libraries are.
     cmdpath = "%s/lib/bup/cmd" % exeprefix
     libpath = "%s/lib/bup" % exeprefix
+    resourcepath = libpath
 else:
     # running from the src directory without being installed first
     cmdpath = os.path.join(exepath, 'cmd')
     libpath = os.path.join(exepath, 'lib')
+    resourcepath = libpath
 sys.path[:0] = [libpath]
 os.environ['PYTHONPATH'] = libpath + ':' + os.environ.get('PYTHONPATH', '')
 os.environ['BUP_MAIN_EXE'] = os.path.abspath(exe)
+os.environ['BUP_RESOURCE_PATH'] = resourcepath
 
 from bup.helpers import *
 
 
-def columnate(l, prefix):
-    l = l[:]
-    clen = max(len(s) for s in l)
-    ncols = (78 - len(prefix)) / (clen + 2)
-    if ncols <= 1:
-        ncols = 1
-        clen = 0
-    cols = []
-    while len(l) % ncols:
-        l.append('')
-    rows = len(l)/ncols
-    for s in range(0, len(l), rows):
-        cols.append(l[s:s+rows])
-    out = ''
-    for row in zip(*cols):
-        out += prefix + ''.join(('%-*s' % (clen+2, s)) for s in row) + '\n'
-    return out
-
-
 def usage():
     log('Usage: bup [-?|--help] [-d=BUP_DIR|--bup-dir=BUP_DIR] COMMAND [ARGS]'
         + '\n\n')
@@ -57,6 +40,7 @@ def usage():
         midx = 'Index objects to speed up future backups',
         save = 'Save files into a backup set (note: run "bup index" first)',
         split = 'Split a single file into its own backup set',
+        web = 'Launch a web server to examine backup sets',
     )
 
     log('Common commands:\n')
@@ -84,7 +68,8 @@ if len(argv) < 2:
 
 # Handle global options.
 try:
-    global_args, subcmd = getopt.getopt(argv[1:], '?d:', ['help', 'bup-dir='])
+    global_args, subcmd = getopt.getopt(argv[1:], '?Vd:',
+                                        ['help', 'version', 'bup-dir='])
 except getopt.GetoptError, ex:
     log('error: ' + ex.msg + '\n')
     usage()
@@ -95,6 +80,8 @@ dest_dir = None
 for opt in global_args:
     if opt[0] == '-?' or opt[0] == '--help':
         help_requested = True
+    if opt[0] == '-V' or opt[0] == '--version':
+        subcmd = ['version']
     elif opt[0] == '-d' or opt[0] == '--bup-dir':
         dest_dir = opt[1]
     else: