diff options
author | Dave Arter <davea@mysociety.org> | 2020-04-27 10:37:12 +0100 |
---|---|---|
committer | Dave Arter <davea@mysociety.org> | 2020-04-27 13:04:01 +0100 |
commit | 813d8a0273764b6215e739f268dc7243d768a205 (patch) | |
tree | ce93afa8fd41e7497bd34ec1c58e7d1e25045592 | |
parent | f70ef9f6a612d3387db24519e163e6b326a9fb64 (diff) |
Respect SKIP_PACKAGES_INSTALL when not in Docker too
When working locally it’s not convenient to always run install_packages
as part of ./script/update, so this commit allows you to define
the SKIP_PACKAGES_INSTALL environment variable to stop that.
-rwxr-xr-x | script/bootstrap | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/script/bootstrap b/script/bootstrap index 10dc94bdf..f40e97b18 100755 --- a/script/bootstrap +++ b/script/bootstrap @@ -5,16 +5,16 @@ cd "$(dirname "$0")/.." git submodule --quiet update --init --recursive --rebase -# Let's see if we can't work out where we might be running. -if cut -d/ -f2 /proc/self/cgroup | sort -u | grep -q docker ; then - if [ -z ${SKIP_PACKAGES_INSTALL:+x} ] ; then +if [ -z ${SKIP_PACKAGES_INSTALL:+x} ] ; then + # Let's see if we can't work out where we might be running. + if cut -d/ -f2 /proc/self/cgroup | sort -u | grep -q docker ; then echo "==> Installing Docker packages..." sudo bin/install_packages docker + else + # Fallback + echo "==> Installing generic packages..." + sudo bin/install_packages generic fi -else - # Fallback - echo "==> Installing generic packages..." - sudo bin/install_packages generic fi bin/install_perl_modules |