Simplify bup startup process

[bup.git] / cmd / help-cmd.py

diff --git a/cmd/help-cmd.py b/cmd/help-cmd.py
index c2b84c895044581b4d705f7412bbf0ed7aee468d..4ad5f74d102bfed40764926810fab09d4ec1e32b 100755 (executable)
--- a/cmd/help-cmd.py
+++ b/cmd/help-cmd.py
@@ -1,4 +1,11 @@
-#!/usr/bin/env python
+#!/bin/sh
+"""": # -*-python-*-
+bup_python="$(dirname "$0")/bup-python" || exit $?
+exec "$bup_python" "$0" ${1+"$@"}
+"""
+# end of bup preamble
+
+from __future__ import absolute_import
 import sys, os, glob
 from bup import options, path
 
@@ -10,15 +17,19 @@ o = options.Options(optspec)
 
 if len(extra) == 0:
     # the wrapper program provides the default usage string
-    os.execvp(os.environ['BUP_MAIN_EXE'], ['bup'])
+    os.execvp(path.exe(), ['bup'])
 elif len(extra) == 1:
     docname = (extra[0]=='bup' and 'bup' or ('bup-%s' % extra[0]))
     manpath = os.path.join(path.exedir(),
                            'Documentation/' + docname + '.[1-9]')
     g = glob.glob(manpath)
-    if g:
-        os.execvp('man', ['man', '-l', g[0]])
-    else:
-        os.execvp('man', ['man', docname])
+    try:
+        if g:
+            os.execvp('man', ['man', '-l', g[0]])
+        else:
+            os.execvp('man', ['man', docname])
+    except OSError as e:
+        sys.stderr.write('Unable to run man command: %s\n' % e)
+        sys.exit(1)
 else:
     o.fatal("exactly one command name expected")