summaryrefslogtreecommitdiffhomepage
path: root/scripts
diff options
context:
space:
mode:
authorAdin Scannell <ascannell@google.com>2020-01-27 10:04:07 -0800
committergVisor bot <gvisor-bot@google.com>2020-01-27 12:21:00 -0800
commitd29e59af9fbd420e34378bcbf7ae543134070217 (patch)
treeaff60c95c843048d194a8317d200f2f2c2d210df /scripts
parent6b43cf791a74a746443f70f98d859c1246f87e2a (diff)
Standardize on tools directory.
PiperOrigin-RevId: 291745021
Diffstat (limited to 'scripts')
-rwxr-xr-xscripts/common.sh6
-rwxr-xr-xscripts/common_build.sh (renamed from scripts/common_bazel.sh)0
2 files changed, 1 insertions, 5 deletions
diff --git a/scripts/common.sh b/scripts/common.sh
index fdb1aa142..cd91b9f8e 100755
--- a/scripts/common.sh
+++ b/scripts/common.sh
@@ -16,11 +16,7 @@
set -xeou pipefail
-if [[ -f $(dirname $0)/common_google.sh ]]; then
- source $(dirname $0)/common_google.sh
-else
- source $(dirname $0)/common_bazel.sh
-fi
+source $(dirname $0)/common_build.sh
# Ensure it attempts to collect logs in all cases.
trap collect_logs EXIT
diff --git a/scripts/common_bazel.sh b/scripts/common_build.sh
index a473a88a4..a473a88a4 100755
--- a/scripts/common_bazel.sh
+++ b/scripts/common_build.sh