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 | |
parent | 54495b266266aa57d0c0f9a290f244ecc6728692 (diff) | |
parent | 9a13d4aab8954939a75bf26f52761ac4f7a100d0 (diff) |
Merge remote-tracking branch 'origin/cdpath-fix'
-rwxr-xr-x | bin/install_perl_modules | 2 | ||||
-rwxr-xr-x | bin/make_css | 6 |
2 files changed, 4 insertions, 4 deletions
diff --git a/bin/install_perl_modules b/bin/install_perl_modules index 3e43b5bb7..d757facb6 100755 --- a/bin/install_perl_modules +++ b/bin/install_perl_modules @@ -2,7 +2,7 @@ set -e -DIR="$( cd -P "$( dirname "${BASH_SOURCE[0]}" )" && pwd | sed -e 's/\/bin$//' )" +DIR="$( cd -P "$( dirname "${BASH_SOURCE[0]}" )" >/dev/null && pwd | sed -e 's/\/bin$//' )" $DIR/vendor/bin/carton install --deployment --without uk --without zurich --without open311-endpoint 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`} |