diff --git a/drake_bazel_download/README.md b/drake_bazel_download/README.md index eca70de5..333396fc 100644 --- a/drake_bazel_download/README.md +++ b/drake_bazel_download/README.md @@ -8,17 +8,18 @@ For an introduction to Bazel, refer to ## Instructions -First, run the `install_prereqs` script to download the Drake source to `/opt/drake/`. -This also runs Drake's setup script to install the required Ubuntu packages: +First, run the `install_prereqs` script to download the +Drake source to `/opt/drake/`. This also runs Drake's +setup script to install the required Ubuntu packages: ```bash -sudo setup/install_prereqs +setup/install_prereqs ``` Additionally, if you don't already have bazel or bazelisk installed, then install bazelisk: ```bash -sudo setup/install_bazelisk +setup/install_bazelisk ``` Then, to build and test all apps: diff --git a/drake_bazel_download/setup/install_bazelisk b/drake_bazel_download/setup/install_bazelisk index 0032a5a6..f7be3525 100755 --- a/drake_bazel_download/setup/install_bazelisk +++ b/drake_bazel_download/setup/install_bazelisk @@ -6,12 +6,12 @@ set -euxo pipefail -if [[ "${EUID:-}" -ne 0 ]]; then - echo 'This script must be run as root' >&2 - exit 2 +maybe_sudo= +if [[ "${EUID}" -ne 0 ]]; then + maybe_sudo=sudo fi wget -O bazelisk.deb \ https://github.com/bazelbuild/bazelisk/releases/download/v1.24.0/bazelisk-amd64.deb -dpkg -i bazelisk.deb +${maybe_sudo} dpkg -i bazelisk.deb rm -f bazelisk.deb diff --git a/drake_bazel_download/setup/install_prereqs b/drake_bazel_download/setup/install_prereqs index 42113566..f49b09af 100755 --- a/drake_bazel_download/setup/install_prereqs +++ b/drake_bazel_download/setup/install_prereqs @@ -31,20 +31,20 @@ set -euxo pipefail -if [[ "${EUID:-}" -ne 0 ]]; then - echo 'This script must be run as root' >&2 - exit 2 +maybe_sudo= +if [[ "${EUID}" -ne 0 ]]; then + maybe_sudo=sudo fi -apt-get update -apt-get install --no-install-recommends lsb-release +${maybe_sudo} apt-get update +${maybe_sudo} apt-get install --no-install-recommends lsb-release if [[ "$(lsb_release -sc)" != 'jammy' ]]; then echo 'This script requires Ubuntu 22.04 (Jammy)' >&2 exit 3 fi -apt-get install --no-install-recommends $(cat <&2 - exit 2 + maybe_sudo= + if [[ "${EUID}" -ne 0 ]]; then + maybe_sudo=sudo fi - apt-get update - apt-get install --no-install-recommends lsb-release + ${maybe_sudo} apt-get update + ${maybe_sudo} apt-get install --no-install-recommends lsb-release if [[ "$(lsb_release -sc)" != 'jammy' ]]; then echo 'This script requires Ubuntu 22.04 (Jammy)' >&2 exit 3 fi - apt-get install --no-install-recommends $(cat <