diff --git a/support-frontend/Brewfile b/support-frontend/Brewfile index 682059caf3..700d7e6cf2 100644 --- a/support-frontend/Brewfile +++ b/support-frontend/Brewfile @@ -2,4 +2,3 @@ tap "guardian/devtools" brew "guardian/devtools/dev-nginx" cask "gu-scala" brew "awscli" -brew "yarn" diff --git a/support-frontend/setup.sh b/support-frontend/setup.sh index cf3f1943ed..8d7652f94f 100755 --- a/support-frontend/setup.sh +++ b/support-frontend/setup.sh @@ -111,10 +111,9 @@ setup_nginx() { dev-nginx restart-nginx } -install_yarn_if_linux() { - # This will be installed by 'install_brew_deps' if on mac - if linux && ! installed yarn; then - sudo apt-get install yarn +install_yarn() { + if ! installed yarn; then + npm install -g yarn fi } @@ -139,11 +138,11 @@ main () { check_encryption create_aws_config install_node + install_yarn install_homebrew_if_mac install_brew_deps setup_nginx install_jdk - install_yarn_if_linux install_js_deps report