Mercurial > kallithea
changeset 5378:bdfba68cdfea
cleanup: remove empty trailing lines
author | Mads Kiilerich <madski@unity3d.com> |
---|---|
date | Tue, 11 Aug 2015 12:39:07 +0200 |
parents | 12fffed05406 |
children | 1949ece749ce |
files | kallithea/tests/fixture.py whitespacecleanup.sh |
diffstat | 2 files changed, 11 insertions(+), 12 deletions(-) [+] |
line wrap: on
line diff
--- a/kallithea/tests/fixture.py Tue Aug 11 12:39:07 2015 +0200 +++ b/kallithea/tests/fixture.py Tue Aug 11 12:39:07 2015 +0200 @@ -295,4 +295,3 @@ f_path=filename ) return cs -
--- a/whitespacecleanup.sh Tue Aug 11 12:39:07 2015 +0200 +++ b/whitespacecleanup.sh Tue Aug 11 12:39:07 2015 +0200 @@ -3,18 +3,18 @@ # Enforce some consistency in whitespace - just to avoid spurious whitespaces changes files=`hg loc '*.py' '*.html' '*.css' '*.rst' '*.txt' '*.js' | egrep -v '/lockfiles.py|LICENSE-MERGELY.html|/codemirror/|/fontello/|(graph|mergely|native.history|select2/select2|yui.flot|yui.2.9)\.js$'` -sed -i "s,`printf '\t'`, ,g" $files -sed -i "s, *$,,g" $files -# add trailing newline if missing: -sed -i '$a\' $files +sed -i -e "s,`printf '\t'`, ,g" $files +sed -i -e "s, *$,,g" $files +# ensure one trailing newline - remove empty last line and make last line include trailing newline: +sed -i -e '$,${/^$/d}' -e '$a\' $files -sed -i 's,\([^ /]\){,\1 {,g' `hg loc '*.css'` -sed -i 's|^\([^ /].*,\)\([^ ]\)|\1 \2|g' `hg loc '*.css'` +sed -i -e 's,\([^ /]\){,\1 {,g' `hg loc '*.css'` +sed -i -e 's|^\([^ /].*,\)\([^ ]\)|\1 \2|g' `hg loc '*.css'` -sed -i 's/^\( [^: ]*\) *: *\([^/]\)/\1: \2/g' kallithea/public/css/{style,contextbar}.css -sed -i '1s|, |,|g' kallithea/public/css/{style,contextbar}.css -sed -i 's/^\([^ ,/]\+ [^,]*[^ ,]\) *, *\(.\)/\1,\n\2/g' kallithea/public/css/{style,contextbar}.css -sed -i 's/^\([^ ,/].*\) */\1 /g' kallithea/public/css/{style,contextbar}.css -sed -i 's,^--$,-- ,g' kallithea/templates/email_templates/main.txt +sed -i -e 's/^\( [^: ]*\) *: *\([^/]\)/\1: \2/g' kallithea/public/css/{style,contextbar}.css +sed -i -e '1s|, |,|g' kallithea/public/css/{style,contextbar}.css +sed -i -e 's/^\([^ ,/]\+ [^,]*[^ ,]\) *, *\(.\)/\1,\n\2/g' kallithea/public/css/{style,contextbar}.css +sed -i -e 's/^\([^ ,/].*\) */\1 /g' kallithea/public/css/{style,contextbar}.css +sed -i -e 's,^--$,-- ,g' kallithea/templates/email_templates/main.txt hg diff