Remove $(dirname "$0") from sys.path

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

diff --git a/lib/cmd/on--server-cmd.py b/lib/cmd/on--server-cmd.py
index e5b7b19054880be08d59387c783f556a378fa541..39407155a896545750c4ddd577c8bc2cb7ba957e 100755 (executable)
--- a/lib/cmd/on--server-cmd.py
+++ b/lib/cmd/on--server-cmd.py
@@ -1,14 +1,28 @@
 #!/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 sys, os, struct
 
-from bup import options, helpers, path
+# Intentionally replace the dirname "$0" that python prepends
+import os, sys
+sys.path[0] = os.path.dirname(os.path.realpath(__file__)) + '/..'
+
+import struct
+
+from bup import compat, options, helpers, path
 from bup.compat import environ, py_maj
 from bup.io import byte_stream
 
@@ -18,7 +32,7 @@ bup on--server
     This command is run automatically by 'bup on'
 """
 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 arguments expected')