fuse: detect fusepy module

[bup.git] / dev / hardlink-sets

diff --git a/dev/hardlink-sets b/dev/hardlink-sets
index e1be7424b8c2d00670d6f397e8f6b4fa97f8afd9..fb0bdb7e4b86e02242b06b5708f019b9a102cf73 100755 (executable)
--- a/dev/hardlink-sets
+++ b/dev/hardlink-sets
@@ -1,24 +1,13 @@
 #!/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
-bup_python="$(dirname "$0")/bup-python" || exit $?
-exec "$bup_python" "$0"
+bup_exec="$(dirname "$0")/bup-exec" || exit $?
+exec "$bup_exec" "$0" ${1+"$@"}
 """
-# end of bup preamble
 
 from __future__ import absolute_import, print_function
 import os, stat, sys
 
-sys.path[:0] = [os.path.dirname(os.path.realpath(__file__)) + '/../lib']
-
-from bup import compat
+from bup.compat import get_argvb
 from bup.io import byte_stream
 
 
@@ -29,7 +18,9 @@ from bup.io import byte_stream
 def usage():
     print("Usage: hardlink-sets <paths ...>", file=sys.stderr)
 
-if len(compat.argv) < 2:
+argvb = get_argvb()
+
+if len(argvb) < 2:
     usage()
     sys.exit(1)
 
@@ -41,7 +32,7 @@ out = byte_stream(sys.stdout)
 
 hardlink_set = {}
 
-for p in compat.argvb[1:]:
+for p in argvb[1:]:
   for root, dirs, files in os.walk(p, onerror = on_walk_error):
       for filename in files:
           full_path = os.path.join(root, filename)