git.list_refs: change arg from refnames to patterns

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

diff --git a/cmd/help-cmd.py b/cmd/help-cmd.py
index 796ddbfabcae0d94b3b0c43a5bb49c1adfebd790..95155b6ad28d8dde6904367e484ffafb0edc086c 100755 (executable)
--- a/cmd/help-cmd.py
+++ b/cmd/help-cmd.py
@@ -1,4 +1,9 @@
-#!/usr/bin/env python
+#!/bin/sh
+"""": # -*-python-*-
+bup_python="$(dirname "$0")/bup-python" || exit $?
+exec "$bup_python" "$0" ${1+"$@"}
+"""
+# end of bup preamble
 import sys, os, glob
 from bup import options, path
 
@@ -14,11 +19,15 @@ if len(extra) == 0:
 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]')
+                           '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")