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 aeacc70dc41420ee30fa03d4df1eae7c8b4af967..684df72c03ea87169fa31781df7e0157ad66f137 100755 (executable)
--- a/lib/cmd/help-cmd.py
+++ b/lib/cmd/help-cmd.py
@@ -9,7 +9,7 @@ for arg in "$@"; do
     arg_i=$((arg_i + 1))
 done
 # Here to end of preamble replaced during install
-bup_python="$(dirname "$0")/bup-python" || exit $?
+bup_python="$(dirname "$0")/../../config/bin/python" || exit $?
 exec "$bup_python" "$0"
 """
 # end of bup preamble
@@ -20,6 +20,7 @@ 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 = """
@@ -30,11 +31,11 @@ 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: