From a1e3845b65c266fe083e67811657bb7b764c4413 Mon Sep 17 00:00:00 2001
From: Adin Scannell <ascannell@google.com>
Date: Tue, 5 Jan 2021 18:52:55 -0800
Subject: Make build command more robust.

This returns all targets, and handles no targets.

PiperOrigin-RevId: 350263578
---
 tools/bazel.mk            | 12 ++++++------
 tools/workspace_status.sh |  2 +-
 2 files changed, 7 insertions(+), 7 deletions(-)

(limited to 'tools')

diff --git a/tools/bazel.mk b/tools/bazel.mk
index 9b8def713..a0246a560 100644
--- a/tools/bazel.mk
+++ b/tools/bazel.mk
@@ -189,13 +189,13 @@ build_paths = \
   (set -euo pipefail; \
   $(call wrapper,$(BAZEL) build $(BASE_OPTIONS) $(1)) 2>&1 \
   | tee /proc/self/fd/2 \
-  | grep -A1 -E '^Target' \
-  | grep -E '^  ($(subst $(SPACE),|,$(BUILD_ROOTS)))' \
-  | sed "s/ /\n/g" \
-  | strings -n 10 \
+  | sed -n -e '/^Target/,$$p' \
+  | sed -n -e '/^  \($(subst /,\/,$(subst $(SPACE),\|,$(BUILD_ROOTS)))\)/p' \
+  | sed -e 's/ /\n/g' \
   | awk '{$$1=$$1};1' \
-  | xargs -n 1 -I {} readlink -f "{}" \
-  | xargs -n 1 -I {} bash -c 'set -xeuo pipefail; $(2)')
+  | strings \
+  | xargs -r -n 1 -I {} readlink -f "{}" \
+  | xargs -r -n 1 -I {} bash -c 'set -xeuo pipefail; $(2)')
 
 clean = $(call header,CLEAN) && $(call wrapper,$(BAZEL) clean)
 build = $(call header,BUILD $(1)) && $(call build_paths,$(1),echo {})
diff --git a/tools/workspace_status.sh b/tools/workspace_status.sh
index a22c8c9f2..62d78ed3d 100755
--- a/tools/workspace_status.sh
+++ b/tools/workspace_status.sh
@@ -15,4 +15,4 @@
 # limitations under the License.
 
 # The STABLE_ prefix will trigger a re-link if it changes.
-echo STABLE_VERSION $(git describe --always --tags --abbrev=12 --dirty || echo 0.0.0)
+echo STABLE_VERSION "$(git describe --always --tags --abbrev=12 --dirty 2>/dev/null || echo 0.0.0)"
-- 
cgit v1.2.3