diff options
| author | Matthew Somerville <matthew-github@dracos.co.uk> | 2016-05-31 15:37:35 +0100 |
|---|---|---|
| committer | Matthew Somerville <matthew-github@dracos.co.uk> | 2016-05-31 15:37:35 +0100 |
| commit | 7118fe5e033d6af9ac8eae6c69278791d5e8547d (patch) | |
| tree | 674ead661eda1363752f628d07c6cadd612be81f /bin/install-as-user | |
| parent | 34fdac8fd6452653762e49981858a843b68cf1a0 (diff) | |
| parent | 54988561abba0ffdb44cc0baf0c2042ba9770b18 (diff) | |
Merge branch 'move-to-libsass'
Diffstat (limited to 'bin/install-as-user')
| -rwxr-xr-x | bin/install-as-user | 33 |
1 files changed, 7 insertions, 26 deletions
diff --git a/bin/install-as-user b/bin/install-as-user index 297efc1f3..99eca0b82 100755 --- a/bin/install-as-user +++ b/bin/install-as-user @@ -71,32 +71,6 @@ if [ ! "$DEVELOPMENT_INSTALL" = true ]; then echo $DONE_MSG fi -# Install the compass gem locally - it's required for generating the -# CSS. Don't trust the bundled bundler in e.g. precise. -echo "Setting up CSS... " -gem1.9.1 install --user-install --no-ri --no-rdoc bundler -FMS_GEMPATH="$DIRECTORY/gem-bin" -FMS_GEMPATH="$FMS_GEMPATH:$(ruby1.9.1 -rubygems -e 'puts Gem.user_dir')/bin" -export PATH="$FMS_GEMPATH:$PATH" - -if ! grep -q 'Set up local PATH for FixMyStreet' $HOME/.bashrc; then - cat >>$HOME/.bashrc <<EOBRC - -# Set up local PATH for FixMyStreet -export PATH="$FMS_GEMPATH:\$PATH" -EOBRC -fi - -bundle install --deployment --path "$DIRECTORY/gems" --binstubs "$DIRECTORY/gem-bin" - -# Use compass to generate the CSS, if it doesn't seem to already -# exist: -if [ ! -f web/cobrands/default/base.css ] -then - bin/make_css -fi -echo $DONE_MSG - # Write sensible values into the config file, if it doesn't already exist if [ ! -f conf/general.yml ]; then echo -n "Setting up default conf/general.yml file... " @@ -117,6 +91,13 @@ cd "$REPOSITORY" bin/install_perl_modules echo $DONE_MSG +echo "Setting up CSS... " +if [ ! -f web/cobrands/default/base.css ] +then + bin/make_css +fi +echo $DONE_MSG + # Create the database if it doesn't exist: echo -n "Setting up database... " if ! psql -l | egrep "^ *$DB_NAME *\|" > /dev/null |