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

[bup.git] / lib / cmd / cat-file-cmd.py

diff --git a/lib/cmd/cat-file-cmd.py b/lib/cmd/cat-file-cmd.py
index 3f776a284d46f1ca83f8f31793c74f4d30b38ec0..388ca03abcbe519e0c84eea7a72fa41378ad42ad 100755 (executable)
--- a/lib/cmd/cat-file-cmd.py
+++ b/lib/cmd/cat-file-cmd.py
@@ -1,14 +1,25 @@
 #!/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 re, stat, sys
+import os.path, re, stat, sys
 
-from bup import options, git, vfs
+sys.path[:0] = [os.path.dirname(os.path.realpath(__file__)) + '/..']
+
+from bup import compat, options, git, vfs
 from bup.compat import argv_bytes
 from bup.helpers import chunkyreader, handle_ctrl_c, log, saved_errors
 from bup.io import byte_stream
@@ -24,7 +35,7 @@ bupm        print the target directory's .bupm file directly to stdout
 handle_ctrl_c()
 
 o = options.Options(optspec)
-(opt, flags, extra) = o.parse(sys.argv[1:])
+opt, flags, extra = o.parse(compat.argv[1:])
 
 git.check_repo_or_die()