diff options
author | Matthew Somerville <matthew@mysociety.org> | 2015-10-09 14:08:41 +0100 |
---|---|---|
committer | Matthew Somerville <matthew@mysociety.org> | 2015-10-09 14:08:41 +0100 |
commit | 444e758807712b4b842e8c0b4d0372dc6b6b7f15 (patch) | |
tree | 29c8f4a5839c38abc90399206e5ff79f23763f00 /bin/make_css | |
parent | 54495b266266aa57d0c0f9a290f244ecc6728692 (diff) | |
parent | 9a13d4aab8954939a75bf26f52761ac4f7a100d0 (diff) |
Merge remote-tracking branch 'origin/cdpath-fix'
Diffstat (limited to 'bin/make_css')
-rwxr-xr-x | bin/make_css | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/bin/make_css b/bin/make_css index 715e0b0e2..87126ef28 100755 --- a/bin/make_css +++ b/bin/make_css @@ -11,14 +11,14 @@ COMPASS=compass SASS=sass -DIR=$(cd "$(dirname "$0")" && pwd -P) -PARENT=$(cd "$DIR"/../.. && pwd) +DIR=$(cd "$(dirname "$0")" >/dev/null && pwd -P) +PARENT=$(cd "$DIR"/../.. >/dev/null && pwd) if [ -f "$PARENT/gem-bin/compass" ]; then COMPASS=$PARENT/gem-bin/compass SASS=$PARENT/gem-bin/sass fi -DIRECTORY=$(cd "$DIR"/../web && pwd) +DIRECTORY=$(cd "$DIR"/../web >/dev/null && pwd) DIRS=${@:-`find -L $DIRECTORY -name "*.scss" -exec dirname {} \; | uniq`} |