diff options
| -rwxr-xr-x | bin/make_css | 22 |
1 files changed, 7 insertions, 15 deletions
diff --git a/bin/make_css b/bin/make_css index 80fcb462f..c48dda4d6 100755 --- a/bin/make_css +++ b/bin/make_css @@ -13,20 +13,12 @@ DIRECTORY=$(cd `dirname $0`/../web && pwd) -# FixMyStreet uses compass -NEWSTYLE=${1:-`find $DIRECTORY -name "config.rb" -exec dirname {} \;`} -NEWSTYLE_REGEX=$(sed 's/ /\\|/g' <<< $NEWSTYLE) -for site in $NEWSTYLE; do - compass compile --output-style compressed $site -done - -# If given a command line argument, assume was a compass directory and exit -if [ -n "$1" ]; then - exit 0 -fi +DIRS=${1:-`find $DIRECTORY -name "*.scss" -exec dirname {} \; | uniq`} -# The rest are plain sass -for scss in `find $DIRECTORY -name "*.scss" -exec dirname {} \; | uniq | grep -v "\($NEWSTYLE_REGEX\)"` -do - sass --scss --update --style compressed $scss +for dir in $DIRS; do + if [ -e "$dir/config.rb" ]; then + compass compile --output-style compressed $dir + else + sass --scss --update --style compressed $dir + fi done |