diff options
author | Struan Donald <struan@exo.org.uk> | 2011-09-05 16:59:05 +0100 |
---|---|---|
committer | Struan Donald <struan@exo.org.uk> | 2011-09-05 16:59:05 +0100 |
commit | eb823376088f47abf23050a0193225a45b51d6d3 (patch) | |
tree | a6eb5fc8cf694a7dd70d7d1a957d65ec09a6c60a /bin | |
parent | bc39723b98a0bb07cc8d57e99489e3a014d857ef (diff) | |
parent | 7fc1083eb431312a59758c473e8ff52ceb8585ef (diff) |
Merge branch 'master' of ssh://git.mysociety.org/data/git/public/fixmystreet into js-validation
Conflicts:
templates/web/default/common_header_tags.html
Diffstat (limited to 'bin')
-rwxr-xr-x | bin/check-for-zombies | 6 | ||||
-rwxr-xr-x | bin/make_css | 5 |
2 files changed, 7 insertions, 4 deletions
diff --git a/bin/check-for-zombies b/bin/check-for-zombies new file mode 100755 index 000000000..57f6793f0 --- /dev/null +++ b/bin/check-for-zombies @@ -0,0 +1,6 @@ +#!/bin/bash +# +# Kill parentless processes still hanging around + +pkill -HUP -P 1 -u $1 -f "perl.*fixmystreet_app" + diff --git a/bin/make_css b/bin/make_css index 7e01da267..59acdb984 100755 --- a/bin/make_css +++ b/bin/make_css @@ -12,7 +12,4 @@ DIRECTORY=$(cd `dirname $0` && pwd) -for file in `find $DIRECTORY/../ -name "*.scss" ! -name "_*"`; do - sass --style expanded $file ${file/scss/css} -done - +sass --scss --update --style compressed $DIRECTORY/.. |