diff options
| author | Marius Halden <marius.h@lden.org> | 2015-11-16 11:15:10 +0100 |
|---|---|---|
| committer | Marius Halden <marius.h@lden.org> | 2015-11-16 11:15:10 +0100 |
| commit | 1339a64632c441e4d7858bd5946738c9840c624d (patch) | |
| tree | 0b1393ca9af05d1af690fbf6c569c195f4136e4c /bin/make_css | |
| parent | 17cc40a8a2387669984ae4a36bb0d30d889d1a07 (diff) | |
| parent | 4fb5331abd2fa4c89ebeb89bc92a245fadd0aa19 (diff) | |
Merge branch 'fiksgatami-dev' into fiksgatami-prod
Oppgrader prod til 1.7
Diffstat (limited to 'bin/make_css')
| -rwxr-xr-x | bin/make_css | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/bin/make_css b/bin/make_css index 3a1fca1a7..87126ef28 100755 --- a/bin/make_css +++ b/bin/make_css @@ -11,16 +11,16 @@ 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 $DIRECTORY -name "*.scss" -exec dirname {} \; | uniq`} +DIRS=${@:-`find -L $DIRECTORY -name "*.scss" -exec dirname {} \; | uniq`} for dir in $DIRS; do if [ -e "$dir/config.rb" ]; then |