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

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

diff --git a/lib/cmd/bloom-cmd.py b/lib/cmd/bloom-cmd.py
index d7537cafc2b9129b6339384107d58b95510a6e91..850382e5ed5bc07842b4f99f898e8b6700d49e3c 100755 (executable)
--- a/lib/cmd/bloom-cmd.py
+++ b/lib/cmd/bloom-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 glob, os, sys, tempfile
 
-from bup import options, git, bloom
+sys.path[:0] = [os.path.dirname(os.path.realpath(__file__)) + '/..']
+
+from bup import compat, options, git, bloom
 from bup.compat import argv_bytes, hexstr
 from bup.helpers import (add_error, debug1, handle_ctrl_c, log, progress, qprogress,
                          saved_errors)
@@ -146,7 +157,7 @@ def do_bloom(path, outfilename, k):
 handle_ctrl_c()
 
 o = options.Options(optspec)
-(opt, flags, extra) = o.parse(sys.argv[1:])
+opt, flags, extra = o.parse(compat.argv[1:])
 
 if extra:
     o.fatal('no positional parameters expected')