Stop forcing LC_CTYPE=ISO-8859-1

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

diff --git a/lib/cmd/random-cmd.py b/lib/cmd/random-cmd.py
index 3eef820143be8ed3f506ce4af8381c6511fdca71..086dfff382bba2f12ddcfd5ce86e85954989657a 100755 (executable)
--- a/lib/cmd/random-cmd.py
+++ b/lib/cmd/random-cmd.py
@@ -1,14 +1,25 @@
 #!/bin/sh
 """": # -*-python-*-
+# 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")/bup-python" || exit $?
-exec "$bup_python" "$0" ${1+"$@"}
+exec "$bup_python" "$0"
 """
 # end of bup preamble
 
 from __future__ import absolute_import
 import os, sys
 
-from bup import options, _helpers
+sys.path[:0] = [os.path.dirname(os.path.realpath(__file__)) + '/..']
+
+from bup import compat, options, _helpers
 from bup.helpers import atoi, handle_ctrl_c, log, parse_num
 
 
@@ -20,7 +31,7 @@ f,force   print random data to stdout even if it's a tty
 v,verbose print byte counter to stderr
 """
 o = options.Options(optspec)
-(opt, flags, extra) = o.parse(sys.argv[1:])
+(opt, flags, extra) = o.parse(compat.argv[1:])
 
 if len(extra) != 1:
     o.fatal("exactly one argument expected")