Bypass Python 3 glibc argv problems by routing args through env

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

diff --git a/lib/cmd/help-cmd.py b/lib/cmd/help-cmd.py
index 4ad5f74d102bfed40764926810fab09d4ec1e32b..c078e825c1f972afe5833196c65e1eaed5b4df2d 100755 (executable)
--- a/lib/cmd/help-cmd.py
+++ b/lib/cmd/help-cmd.py
@@ -1,19 +1,28 @@
 #!/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 sys, os, glob
-from bup import options, path
+from bup import compat, options, path
 
 optspec = """
 bup help <command>
 """
 o = options.Options(optspec)
-(opt, flags, extra) = o.parse(sys.argv[1:])
+opt, flags, extra = o.parse(compat.argv[1:])
 
 if len(extra) == 0:
     # the wrapper program provides the default usage string