diff options
-rw-r--r-- | scripts/packages/BUILD | 9 | ||||
-rw-r--r-- | scripts/packages/debian/bazel.bazelrc | 3 | ||||
-rwxr-xr-x | scripts/packages/template_bin.sh | 22 |
3 files changed, 4 insertions, 30 deletions
diff --git a/scripts/packages/BUILD b/scripts/packages/BUILD index 9b5b0bcd16..fc70dd49ca 100644 --- a/scripts/packages/BUILD +++ b/scripts/packages/BUILD @@ -92,14 +92,6 @@ 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"], @@ -120,7 +112,6 @@ pkg_tar( deps = [ ":bazel-bin", ":bazel-completion", - ":bazel-rc", ], ) diff --git a/scripts/packages/debian/bazel.bazelrc b/scripts/packages/debian/bazel.bazelrc index 36742468a2..e69de29bb2 100644 --- a/scripts/packages/debian/bazel.bazelrc +++ b/scripts/packages/debian/bazel.bazelrc @@ -1,3 +0,0 @@ -common --action_env=PATH -common --action_env=LD_LIBRARY_PATH -common --action_env=TMPDIR diff --git a/scripts/packages/template_bin.sh b/scripts/packages/template_bin.sh index 69837f4ad7..ceb58c83de 100755 --- a/scripts/packages/template_bin.sh +++ b/scripts/packages/template_bin.sh @@ -41,16 +41,14 @@ 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/bazel.bazelrc)." >&2 echo " --user configure for user install, expands to:" >&2 - echo ' --bin=$HOME/bin --base=$HOME/.bazel --bazelrc=$HOME/.bazelrc' >&2 + echo ' --bin=$HOME/bin --base=$HOME/.bazel' >&2 exit 1 } prefix="/usr/local" bin="%prefix%/bin" base="%prefix%/lib/bazel" -bazelrc="/etc/bazel.bazelrc" for opt in "${@}"; do case $opt in @@ -58,7 +56,8 @@ for opt in "${@}"; do prefix="$(echo "$opt" | cut -d '=' -f 2-)" ;; --bazelrc=*) - bazelrc="$(echo "$opt" | cut -d '=' -f 2-)" + # TODO(kchodorow): remove once everything we're testing on CI contains + # this comment. ;; --bin=*) bin="$(echo "$opt" | cut -d '=' -f 2-)" @@ -69,7 +68,6 @@ for opt in "${@}"; do --user) bin="$HOME/bin" base="$HOME/.bazel" - bazelrc="$HOME/.bazelrc" ;; *) usage @@ -79,7 +77,6 @@ done bin="${bin//%prefix%/${prefix}}" base="${base//%prefix%/${prefix}}" -bazelrc="${bazelrc//%prefix%/${prefix}}" test_write() { local file="$1" @@ -133,7 +130,6 @@ fi # Test for write access test_write "${bin}" test_write "${base}" -test_write "${bazelrc}" # Do the actual installation echo -n "Uncompressing." @@ -159,17 +155,7 @@ echo -n . ln -s "${base}/bin/bazel" "${bin}/bazel" echo -n . -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 +if [ "${UID}" -ne 0 ]; then # Uncompress the bazel base install for faster startup time "${bin}/bazel" help >/dev/null fi |