In the complex 'if' chain when merging ikiwiki.pot with .po files, make
sure line-endings, shell-muting and semi-colons don't cause the shell to
bomb out with syntax errors and commands not found.
@echo -n "Merging ikiwiki.pot and $@"
# Typically all that changes is a date or line number. I'd prefer not to
# commit such changes, so detect and ignore them.
@echo -n "Merging ikiwiki.pot and $@"
# Typically all that changes is a date or line number. I'd prefer not to
# commit such changes, so detect and ignore them.
- @if ! msgmerge $@ ikiwiki.pot -o $@.new 2>&1; then
+ @if ! msgmerge $@ ikiwiki.pot -o $@.new 2>&1; then \
echo "unable to run msgmerge"; \
echo "unable to run msgmerge"; \
if [ "`diff $@ $@.new | grep '[<>]' | grep -v '[<>] #:' | wc -l`" -ne 2 ]; then \
mv -f $@.new $@; \
else \
rm -f $@.new; \
if [ "`diff $@ $@.new | grep '[<>]' | grep -v '[<>] #:' | wc -l`" -ne 2 ]; then \
mv -f $@.new $@; \
else \
rm -f $@.new; \
- fi
- @msgfmt --statistics $@ 2>&1
+ fi; \
+ msgfmt --statistics $@ 2>&1 \