diff options
| author | Matthew Somerville <matthew-github@dracos.co.uk> | 2014-11-07 16:46:00 +0000 |
|---|---|---|
| committer | Matthew Somerville <matthew-github@dracos.co.uk> | 2014-11-07 16:46:00 +0000 |
| commit | 1bd78da3b7e1125fe6e30118f61e5265f805c2fd (patch) | |
| tree | d4387c59602af04b3d659cce3c5e636cc4277bae /bin/make_css | |
| parent | 5890095563269359385313253b45f6033de5e8f5 (diff) | |
| parent | d8a7e85e32a5ef6cdda9385d389df2dab3245121 (diff) | |
Merge branch 'trusty-tahr'
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 |