1 files changed, 8 insertions, 7 deletions
diff --git a/scripts/BUILD b/scripts/BUILD
index decf702cfc..7c782cc760 100644
--- a/scripts/BUILD
+++ b/scripts/BUILD
@@ -8,15 +8,16 @@ genrule(
     name = "bash_completion",
     srcs = ["bazel-complete-template.bash"],
     outs = ["bazel-complete.bash"],
-    cmd = "cat $(SRCS) > $@\n" +
-          "touch err.log\n" +
-          "TMP=`mktemp -d $${TMPDIR:-/tmp}/tmp.XXXXXXXXXX`\n" +
-          "trap \"rm -fr err.log $${TMP}\" EXIT\n" +
-          "$(location //src:bazel) " +
-          "    --batch --output_user_root=$${TMP} --host_javabase=$(JAVABASE) " +
-          "    help completion 2>err.log >>$@ || { cat err.log; exit 1; }",
+    cmd = " ".join([
+        "$(location :generate_bash_completion.sh)",
+        "--bazel=$(location //src:bazel)",
+        "--javabase=$(JAVABASE)",
+        "--output=$@",
+        "--prepend=$(location bazel-complete-template.bash)",
+    ]),
     output_to_bindir = 1,
     tools = [
+        ":generate_bash_completion.sh",
         "//src:bazel",
         "//tools/defaults:jdk",
     ],