diff options
| author | Matthew Somerville <matthew@mysociety.org> | 2014-11-05 15:07:54 +0000 |
|---|---|---|
| committer | Matthew Somerville <matthew@mysociety.org> | 2014-11-05 15:33:27 +0000 |
| commit | 92fc64655c5b51ddec3286befd87d9693ca718c2 (patch) | |
| tree | 2904171f3c8940659305f8e627e36ef3558c9d12 /bin/make_css | |
| parent | cdf0d0f5129bd03a2f7990bee6c176cb77fabd3d (diff) | |
Update to use bundler and work on Ubuntu Trusty.
Switching to bundler saves confusion about gem paths when running
sass/compass to compile the CSS.
Trusty can use precisely the same packages as precise, with a few tweaks
to generalise the contents.
Diffstat (limited to 'bin/make_css')
| -rwxr-xr-x | bin/make_css | 14 |
1 files changed, 10 insertions, 4 deletions
diff --git a/bin/make_css b/bin/make_css index 4465f1f9b..a8afafb27 100755 --- a/bin/make_css +++ b/bin/make_css @@ -8,8 +8,14 @@ # # Copyright (c) 2012 UK Citizens Online Democracy. All rights reserved. # Email: matthew@mysociety.org. WWW: http://www.mysociety.org -# -# $Id: send-reports,v 1.79 2010-01-06 16:50:26 louise Exp $ + +COMPASS=compass +SASS=sass +PARENT=$(cd `dirname $0`/../.. && pwd) +if [ -f "$PARENT/gem-bin/compass" ]; then + COMPASS=$PARENT/gem-bin/compass + SASS=$PARENT/gem-bin/sass +fi DIRECTORY=$(cd `dirname $0`/../web && pwd) @@ -17,8 +23,8 @@ DIRS=${@:-`find $DIRECTORY -name "*.scss" -exec dirname {} \; | uniq`} for dir in $DIRS; do if [ -e "$dir/config.rb" ]; then - compass compile --output-style compressed $dir + $COMPASS compile --output-style compressed $dir else - sass --scss --update --style compressed $dir + $SASS --scss --update --style compressed $dir fi done |