diff options
author | Yue Gan <yueg@google.com> | 2016-05-23 13:58:33 +0000 |
---|---|---|
committer | Yue Gan <yueg@google.com> | 2016-05-23 15:27:30 +0000 |
commit | 23c274dcd0174a9bf0f62f028ab62084e9ea440f (patch) | |
tree | 2a751cedaf30aad0ced87ce519e93aaf44da96a7 /scripts | |
parent | d186b17b9fa50f9be18ccb2a6a12983e28b958d7 (diff) |
Rollback of commit 009b48bcfaf4ebb17f9ab03bea9036cfa3c12ff0.
*** Reason for rollback ***
Broke bazel installation on ci.bazel.io, see http://ci.bazel.io/view/Bazel%20bootstrap%20and%20maintenance/job/Bazel-Install/578/console
This change should make --bazelrc a non-op first to remove it.
*** Original change description ***
Remove .bazelrc
This hasn't been used in several releases.
--
MOS_MIGRATED_REVID=122993255
Diffstat (limited to 'scripts')
-rw-r--r-- | scripts/packages/BUILD | 9 | ||||
-rwxr-xr-x | scripts/packages/template_bin.sh | 24 |
2 files changed, 31 insertions, 2 deletions
diff --git a/scripts/packages/BUILD b/scripts/packages/BUILD index 38fc2f3b15..e2f5efef92 100644 --- a/scripts/packages/BUILD +++ b/scripts/packages/BUILD @@ -65,6 +65,14 @@ pkg_tar( strip_prefix = ".", ) +pkg_tar( + name = "bazel-rc", + files = ["debian/bazel.bazelrc"], + mode = "0644", + package_dir = "/etc", + strip_prefix = "debian", +) + genrule( name = "rename-bazel-completion", srcs = ["//scripts:bash_completion"], @@ -85,6 +93,7 @@ pkg_tar( deps = [ ":bazel-bin", ":bazel-completion", + ":bazel-rc", ], ) diff --git a/scripts/packages/template_bin.sh b/scripts/packages/template_bin.sh index 4695ccd750..5b1cfa943c 100755 --- a/scripts/packages/template_bin.sh +++ b/scripts/packages/template_bin.sh @@ -18,6 +18,8 @@ # Installation and etc prefix can be overriden from command line install_prefix=${1:-"/usr/local"} +# TODO(kchodorow): delete by April 2016. +bazelrc=${2:-"/etc/bazel.bazelrc"} progname="$0" @@ -34,20 +36,25 @@ function usage() { echo " --prefix=/some/path set the prefix path (default=/usr/local)." >&2 echo " --bin= set the binary folder path (default=%prefix%/bin)." >&2 echo " --base= set the base install path (default=%prefix%/lib/bazel)." >&2 + echo " --bazelrc= set the path to bazelrc (default=/etc/bazelrc)." >&2 echo " --user configure for user install, expands to:" >&2 - echo ' --bin=$HOME/bin --base=$HOME/.bazel' >&2 + echo ' --bin=$HOME/bin --base=$HOME/.bazel --bazelrc=$HOME/.bazelrc' >&2 exit 1 } prefix="/usr/local" bin="%prefix%/bin" base="%prefix%/lib/bazel" +bazelrc="/etc/bazel.bazelrc" for opt in "${@}"; do case $opt in --prefix=*) prefix="$(echo "$opt" | cut -d '=' -f 2-)" ;; + --bazelrc=*) + bazelrc="$(echo "$opt" | cut -d '=' -f 2-)" + ;; --bin=*) bin="$(echo "$opt" | cut -d '=' -f 2-)" ;; @@ -57,6 +64,7 @@ for opt in "${@}"; do --user) bin="$HOME/bin" base="$HOME/.bazel" + bazelrc="$HOME/.bazelrc" ;; *) usage @@ -66,6 +74,7 @@ done bin="${bin//%prefix%/${prefix}}" base="${base//%prefix%/${prefix}}" +bazelrc="${bazelrc//%prefix%/${prefix}}" function test_write() { local file="$1" @@ -118,6 +127,7 @@ fi # Test for write access test_write "${bin}" test_write "${base}" +test_write "${bazelrc}" # Do the actual installation echo -n "Uncompressing." @@ -143,7 +153,17 @@ echo -n . ln -s "${base}/bin/bazel" "${bin}/bazel" echo -n . -if [ "${UID}" -ne 0 ]; then +if [ -f "${bazelrc}" ]; then + echo + echo "${bazelrc} already exists, moving it to ${bazelrc}.bak." + mv "${bazelrc}" "${bazelrc}.bak" +fi + +# Not necessary, but this way it matches the Debian package. +touch "${bazelrc}" +if [ "${UID}" -eq 0 ]; then + chmod 0644 "${bazelrc}" +else # Uncompress the bazel base install for faster startup time "${bin}/bazel" help >/dev/null fi |