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

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

diff --git a/lib/cmd/on-cmd.py b/lib/cmd/on-cmd.py
index 2c0e9fc808538ba4abb264be964bb3b36e0138c9..9eaabef2eaa833a5d854d754ef3b4cb5b00b4fa4 100755 (executable)
--- a/lib/cmd/on-cmd.py
+++ b/lib/cmd/on-cmd.py
@@ -1,15 +1,26 @@
 #!/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
 from subprocess import PIPE
-import sys, os, struct, getopt, subprocess, signal
+import getopt, os, signal, struct, subprocess, sys
 
-from bup import options, ssh, path
+sys.path[:0] = [os.path.dirname(os.path.realpath(__file__)) + '/..']
+
+from bup import compat, options, ssh, path
 from bup.compat import argv_bytes
 from bup.helpers import DemuxConn, log
 from bup.io import byte_stream
@@ -22,7 +33,7 @@ bup on <hostname> split ...
 bup on <hostname> get ...
 """
 o = options.Options(optspec, optfunc=getopt.getopt)
-(opt, flags, extra) = o.parse(sys.argv[1:])
+opt, flags, extra = o.parse(compat.argv[1:])
 if len(extra) < 2:
     o.fatal('arguments expected')