From 1ea184f049461820921443bd53b12a3784913555 Mon Sep 17 00:00:00 2001 From: Devon Mackay Date: Fri, 6 Jul 2018 13:19:35 -0400 Subject: [PATCH] Update script to use shared fragments from the include dir --- script/setup | 24 +++++------------------- 1 file changed, 5 insertions(+), 19 deletions(-) diff --git a/script/setup b/script/setup index 0fae92e6..925ced94 100755 --- a/script/setup +++ b/script/setup @@ -3,24 +3,10 @@ # script/setup: Set up application for the first time after cloning, or set it # back to the initial first unused state. -# If a command fails, exit the script -set -e +source "$(dirname "${0}")"/../script/include/global_header.inc.sh -# Ensure we are in the app root directory (not the /script directory) -cd "$(dirname "${0}")/.." +# Turn on sass compiler installation +INSTALL_SASS="true" -# Install virtualenv -pip install pipenv -pipenv --python 3.6 - -if ! type sass > /dev/null; then - if type gem > /dev/null; then - echo 'installing a sass compiler...' - gem install sass - else - echo 'Could not install a sass compiler. Please install a version of sass.' - fi -fi - -# Install application dependencies -script/bootstrap +# Run the shared setup script +source ./script/include/run_setup