Prefer python 3, and mention intent to drop python 2 support

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

diff --git a/lib/cmd/help-cmd.py b/lib/cmd/help-cmd.py
index 4ad5f74d102bfed40764926810fab09d4ec1e32b..684df72c03ea87169fa31781df7e0157ad66f137 100755 (executable)
--- a/lib/cmd/help-cmd.py
+++ b/lib/cmd/help-cmd.py
@@ -1,27 +1,41 @@
 #!/bin/sh
 """": # -*-python-*-
-bup_python="$(dirname "$0")/bup-python" || exit $?
-exec "$bup_python" "$0" ${1+"$@"}
+# https://sourceware.org/bugzilla/show_bug.cgi?id=26034
+export "BUP_ARGV_0"="$0"
+arg_i=1
+for arg in "$@"; do
+    export "BUP_ARGV_${arg_i}"="$arg"
+    shift
+    arg_i=$((arg_i + 1))
+done
+# Here to end of preamble replaced during install
+bup_python="$(dirname "$0")/../../config/bin/python" || exit $?
+exec "$bup_python" "$0"
 """
 # end of bup preamble
 
 from __future__ import absolute_import
-import sys, os, glob
-from bup import options, path
+import os, glob, sys
+
+sys.path[:0] = [os.path.dirname(os.path.realpath(__file__)) + '/..']
+
+from bup import compat, options, path
+from bup.compat import argv_bytes
+
 
 optspec = """
 bup help <command>
 """
 o = options.Options(optspec)
-(opt, flags, extra) = o.parse(sys.argv[1:])
+opt, flags, extra = o.parse(compat.argv[1:])
 
 if len(extra) == 0:
     # the wrapper program provides the default usage string
-    os.execvp(path.exe(), ['bup'])
+    os.execvp(path.exe(), [b'bup'])
 elif len(extra) == 1:
-    docname = (extra[0]=='bup' and 'bup' or ('bup-%s' % extra[0]))
+    docname = (extra[0]=='bup' and b'bup' or (b'bup-%s' % argv_bytes(extra[0])))
     manpath = os.path.join(path.exedir(),
-                           'Documentation/' + docname + '.[1-9]')
+                           b'../../Documentation/' + docname + b'.[1-9]')
     g = glob.glob(manpath)
     try:
         if g: