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 12fee0855c3f7bbb5022c22bda2fe63678e4034f..39407155a896545750c4ddd577c8bc2cb7ba957e 100755 (executable)
--- a/lib/cmd/on--server-cmd.py
+++ b/lib/cmd/on--server-cmd.py
@@ -9,15 +9,18 @@ for arg in "$@"; do
     arg_i=$((arg_i + 1))
 done
 # Here to end of preamble replaced during install
-bup_python="$(dirname "$0")/bup-python" || exit $?
+bup_python="$(dirname "$0")/../../config/bin/python" || exit $?
 exec "$bup_python" "$0"
 """
 # end of bup preamble
 
 from __future__ import absolute_import
-import os, struct, sys
 
-sys.path[:0] = [os.path.dirname(os.path.realpath(__file__)) + '/..']
+# 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