Cleanup how we access bazel in build-prereq.sh and settings.sh

PiperOrigin-RevId: 211839502
oeh77 · Sep 6, 2018 · 64ba4ea · 64ba4ea
1 parent 8cd7e95
commit 64ba4ea
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 2 deletions.
diff --git a/build-prereq.sh b/build-prereq.sh
@@ -104,8 +104,6 @@ function ensure_wanted_bazel_version {
     ./bazel-"${wanted_bazel_version}"-installer-linux-x86_64.sh --user
     rm bazel-"${wanted_bazel_version}"-installer-linux-x86_64.sh
     popd
-
-    PATH="$HOME/bin:$PATH"
   fi
 }
 

diff --git a/settings.sh b/settings.sh
@@ -57,6 +57,12 @@ export CUDNN_INSTALL_PATH="/usr/lib/x86_64-linux-gnu"
 # The version of bazel we want to build DeepVariant.
 DV_BAZEL_VERSION="0.15.0"
 
+# We need to make sure that $HOME/bin is first in the binary search path so that
+# `bazel` will find the latest version of bazel installed in the user's home
+# directory. This is set in setting.sh as all DeepVariant scripts source
+# settings.sh and assume that `bazel` will find the right version.
+export PATH="$HOME/bin:$PATH"
+
 # Path to the public bucket containing DeepVariant-related artifacts.
 export DEEPVARIANT_BUCKET="gs://deepvariant"
 export DV_PACKAGE_BUCKET_PATH="${DEEPVARIANT_BUCKET}/packages"
-Original file line number
+Diff line change
@@ Expand Up / @@ -104,8 +104,6 @@ function ensure_wanted_bazel_version { @@
         ./bazel-"${wanted_bazel_version}"-installer-linux-x86_64.sh --user
         rm bazel-"${wanted_bazel_version}"-installer-linux-x86_64.sh
         popd
-        PATH="$HOME/bin:$PATH"
       fi
     }
@@ Expand Down @@