drecurse: use portable S_ISDIR() instead of deriving S_IFMT

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

diff --git a/lib/cmd/rm-cmd.py b/lib/cmd/rm-cmd.py
index c0f7e55bd9ade242cac2ca69f9f4257b01cdc695..1af1e5959efb7c98024b47960eb2b59e7d1e6fcc 100755 (executable)
--- a/lib/cmd/rm-cmd.py
+++ b/lib/cmd/rm-cmd.py
@@ -1,13 +1,25 @@
 #!/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
+import os.path, sys
 
+sys.path[:0] = [os.path.dirname(os.path.realpath(__file__)) + '/..']
+
+from bup import compat
 from bup.compat import argv_bytes
 from bup.git import check_repo_or_die
 from bup.options import Options
@@ -26,7 +38,7 @@ unsafe       use the command even though it may be DANGEROUS
 handle_ctrl_c()
 
 o = Options(optspec)
-opt, flags, extra = o.parse(sys.argv[1:])
+opt, flags, extra = o.parse(compat.argv[1:])
 
 if not opt.unsafe:
     o.fatal('refusing to run dangerous, experimental command without --unsafe')