From 5a18ed0b7e2e3c71c0479f27ee805f2b49b4c953 Mon Sep 17 00:00:00 2001
From: Lizan Zhou <zlizan@google.com>
Date: Mon, 13 Feb 2017 16:10:58 -0800
Subject: [PATCH 1/4] Upgrade bazel to 0.4.4

---
 doc/testing.md                   | 2 +-
 doc/tutorial.md                  | 4 ++--
 script/tools/linux-install-bazel | 2 +-
 script/travis/install            | 2 +-
 4 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/doc/testing.md b/doc/testing.md
index bc9de07fd..a7db49aba 100644
--- a/doc/testing.md
+++ b/doc/testing.md
@@ -1,7 +1,7 @@
 # Testing ESP with Bazel #
 
 ESP is built using [Bazel](http://bazel.io) build tool. Install
-[Bazel](http://bazel.io) version 0.4.3, following the [Bazel
+[Bazel](http://bazel.io) version 0.4.4, following the [Bazel
 documentation](http://bazel.io/docs/install.html).
 
 # Building ESP #
diff --git a/doc/tutorial.md b/doc/tutorial.md
index 55bfa0ac9..af5bf4ab8 100644
--- a/doc/tutorial.md
+++ b/doc/tutorial.md
@@ -23,12 +23,12 @@ On Linux, install:
 ## Bazel ##
 
 ESP is built using [Bazel](http://bazel.io) build tool. Install
-[Bazel](http://bazel.io) version 0.4.3, following the [Bazel
+[Bazel](http://bazel.io) version 0.4.4, following the [Bazel
 documentation](http://bazel.io/docs/install.html).
 
 *Note:* Bazel is under active development and from time to time, ESP continuous
 integration systems are upgraded to a new version of Bazel. Currently, ESP
-requires Bazel 0.4.3.
+requires Bazel 0.4.4.
 
 The version of Bazel used by ESP continuous integration systems can be found in
 the [linux-install-software](/script/linux-install-software)
diff --git a/script/tools/linux-install-bazel b/script/tools/linux-install-bazel
index 9ec386c79..bef6257a0 100755
--- a/script/tools/linux-install-bazel
+++ b/script/tools/linux-install-bazel
@@ -36,7 +36,7 @@ fi
 DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")/.." && pwd)"
 . ${DIR}/all-utilities || { echo "Cannot load Bash utilities" ; exit 1 ; }
 
-BAZEL_VERSION='0.4.3'
+BAZEL_VERSION='0.4.4'
 BAZEL_BASE_URL='https://github.com/bazelbuild/bazel/releases/download'
 BAZEL_SH="bazel-${BAZEL_VERSION}-installer-linux-x86_64.sh"
 BAZEL_URL="${BAZEL_BASE_URL}/${BAZEL_VERSION}/${BAZEL_SH}"
diff --git a/script/travis/install b/script/travis/install
index d4204da35..631b66d9d 100755
--- a/script/travis/install
+++ b/script/travis/install
@@ -36,7 +36,7 @@ ROOT="$(cd "$(dirname "${BASH_SOURCE[0]}")/../.." && pwd)"
 ##################################################
 
 # Download (update the URL when upgrading Bazel)
-BAZEL_INSTALLER_URL='https://github.com/bazelbuild/bazel/releases/download/0.4.3/bazel-0.4.3-installer-linux-x86_64.sh'
+BAZEL_INSTALLER_URL='https://github.com/bazelbuild/bazel/releases/download/0.4.4/bazel-0.4.4-installer-linux-x86_64.sh'
 curl -L "${BAZEL_INSTALLER_URL}" -o ./bazel-installer.sh || \
   error_exit "Failed to get the bazel installer from ${BAZEL_INSTALLER_URL}"
 chmod +x ./bazel-installer.sh

From 4b43e1cb7930002b8c5b3bf3e4ecd067a9665c9a Mon Sep 17 00:00:00 2001
From: Sebastien Vas <sebastienvas@users.noreply.github.com>
Date: Mon, 13 Feb 2017 16:36:58 -0800
Subject: [PATCH 2/4] Update linux-install-bazel

---
 script/tools/linux-install-bazel | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/script/tools/linux-install-bazel b/script/tools/linux-install-bazel
index bef6257a0..3c51cbe9c 100755
--- a/script/tools/linux-install-bazel
+++ b/script/tools/linux-install-bazel
@@ -51,7 +51,7 @@ function update_bazel() {
   fi
 
   if [[ "${BAZEL_VERSION}" != "${bazel_current}" ]]; then
-    retry -n 3 wget -q -nc -P "${BAZEL_DIRECTORY}" "${BAZEL_URL}" \
+    ${SUDO} retry -n 3 wget -q -nc -P "${BAZEL_DIRECTORY}" "${BAZEL_URL}" \
       || error_exit "Could not download bazel"
     ${SUDO} chmod +x "${BAZEL_DIRECTORY}/${BAZEL_SH}" \
       || error_exit "Could not mark bazel shell as executable"

From cce7405ae98f9a47d6d971b17f0b50229d518a89 Mon Sep 17 00:00:00 2001
From: Sebastien Vas <sebastienvas@users.noreply.github.com>
Date: Mon, 13 Feb 2017 16:44:40 -0800
Subject: [PATCH 3/4] Update linux-install-bazel

---
 script/tools/linux-install-bazel | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/script/tools/linux-install-bazel b/script/tools/linux-install-bazel
index 3c51cbe9c..238b0b4e6 100755
--- a/script/tools/linux-install-bazel
+++ b/script/tools/linux-install-bazel
@@ -51,7 +51,7 @@ function update_bazel() {
   fi
 
   if [[ "${BAZEL_VERSION}" != "${bazel_current}" ]]; then
-    ${SUDO} retry -n 3 wget -q -nc -P "${BAZEL_DIRECTORY}" "${BAZEL_URL}" \
+    retry ${SUDO} -n 3 wget -q -nc -P "${BAZEL_DIRECTORY}" "${BAZEL_URL}" \
       || error_exit "Could not download bazel"
     ${SUDO} chmod +x "${BAZEL_DIRECTORY}/${BAZEL_SH}" \
       || error_exit "Could not mark bazel shell as executable"

From c36d82f17d2f50cef80f5c0d9e23f82c9aac5a0f Mon Sep 17 00:00:00 2001
From: Sebastien Vas <sebastienvas@users.noreply.github.com>
Date: Mon, 13 Feb 2017 16:53:35 -0800
Subject: [PATCH 4/4] Update linux-install-bazel

---
 script/tools/linux-install-bazel | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/script/tools/linux-install-bazel b/script/tools/linux-install-bazel
index 238b0b4e6..f18cce6fd 100755
--- a/script/tools/linux-install-bazel
+++ b/script/tools/linux-install-bazel
@@ -51,7 +51,7 @@ function update_bazel() {
   fi
 
   if [[ "${BAZEL_VERSION}" != "${bazel_current}" ]]; then
-    retry ${SUDO} -n 3 wget -q -nc -P "${BAZEL_DIRECTORY}" "${BAZEL_URL}" \
+    retry -n 3 ${SUDO} wget -q -nc -P "${BAZEL_DIRECTORY}" "${BAZEL_URL}" \
       || error_exit "Could not download bazel"
     ${SUDO} chmod +x "${BAZEL_DIRECTORY}/${BAZEL_SH}" \
       || error_exit "Could not mark bazel shell as executable"