commit 137d945a672370c1a12350e36a6e7d6e1190dad9
author Austin Schuh <austin.linux@gmail.com> Sat Jul 07 15:42:36 2018 -0700
committer Austin Schuh <austin.linux@gmail.com> Sat Jul 07 16:07:17 2018 -0700
tree ad4a57572daa67141d5b6a48dd18e7dd92e9188f
parent 35b09e31d00b867796aca2d6a69ac5992fa90fcd

Upgrade bazel

New version has cc_toolchain.proto, which I want.

Change-Id: I43f8837fa92cb0a5298069da6880cf114c6a2ae9

tools/bazel

diff --git a/tools/bazel b/tools/bazel
index 41d2887..6b8f968 100755
--- a/tools/bazel
+++ b/tools/bazel
@@ -24,7 +24,8 @@
   exec "${BAZEL_OVERRIDE}" "$@"
 fi
 
-readonly VERSION="201802152317+9b1b63c"
+readonly VERSION="201807071512+aa7e972"
+#bazel_201807071512+aa7e972.xz
 
 readonly DOWNLOAD_DIR="$(dirname "${BASH_SOURCE[0]}")/../bazel-downloads"
 # Directory to unpack bazel into.  This must change whenever bazel changes.
@@ -40,7 +41,7 @@
   exit 1
 fi
 
-readonly INSTALLER_NAME="bazel_${VERSION}-linux-x86_64.deb"
+readonly INSTALLER_NAME="bazel_${VERSION}.xz"
 readonly DOWNLOAD_URL="http://frc971.org/Build-Dependencies/${INSTALLER_NAME}"
 
 if [[ ! -d "${VERSION_DIR}" ]]; then
@@ -60,7 +61,11 @@
     # Now, download into the ~/.cache folder
     if [ ! -e "${HOME}/.cache/bazel/${INSTALLER_NAME}" ];
     then
-      wget "${DOWNLOAD_URL}" -O "${INSTALLER_NAME}" --no-verbose --show-progress
+      if [ -t 0 ] ; then
+        wget "${DOWNLOAD_URL}" -O "${INSTALLER_NAME}" --no-verbose --show-progress
+      else
+        wget "${DOWNLOAD_URL}" -O "${INSTALLER_NAME}" --no-verbose --quiet
+      fi
       mv "${INSTALLER_NAME}" "${HOME}/.cache/bazel/${INSTALLER_NAME}"
     fi
     rm -rf "${DOWNLOAD_TEMP_DIR}"
@@ -68,7 +73,9 @@
 
   ( cd "${TEMP_DIR}"
     echo "Unpacking Bazel version ${VERSION}..." >&2
-    dpkg-deb -x "${HOME}/.cache/bazel/${INSTALLER_NAME}" extracted
+    mkdir -p extracted/usr/bin
+    xz -d ${HOME}/.cache/bazel/${INSTALLER_NAME} -c > extracted/usr/bin/bazel-real
+    chmod a+x extracted/usr/bin/bazel-real
   )
 
   touch "${TEMP_DIR}/extracted/usr/bin/bazel.bazelrc"