[SCM] live-helper branch, debian-next, updated. debian/2.0_a13-1-9-g75574aa

[Daniel Baumann]

The following commit has been merged in the debian-next branch:
commit f496e2dd4deab77bbc172304d80010c6ec3d35c7
Author: Daniel Baumann <daniel at debian.org>
Date:   Mon May 24 22:11:06 2010 +0200

    Simplyfing makefile a bit.

diff --git a/Makefile b/Makefile
index 3b2caac..440634c 100644
--- a/Makefile
+++ b/Makefile
@@ -4,12 +4,14 @@ SHELL := sh -e
 
 LANGUAGES = de
 
+SCRIPTS = live-helper.sh cgi/* functions/* examples/*/*.sh helpers/* hooks/*
+
 all: test build
 
 test:
 	@echo -n "Checking for syntax errors"
 
-	@for SCRIPT in live-helper.sh cgi/* functions/* examples/*/*.sh helpers/* hooks/*; \
+	@for SCRIPT in $(SCRIPTS); \
 	do \
 		sh -n $${SCRIPT}; \
 		echo -n "."; \
@@ -17,13 +19,14 @@ test:
 
 	@echo " done."
 
+	@# We can't just fail yet on bashisms (FIXME)
 	@echo -n "Checking for bashisms"
 
 	@if [ -x /usr/bin/checkbashisms ]; \
 	then \
-		for SCRIPT in live-helper.sh functions/* examples/*/*.sh helpers/* hooks/*; \
+		for SCRIPT in $(SCRIPTS); \
 		do \
-			checkbashisms $${SCRIPT}; \
+			checkbashisms $${SCRIPT} || true; \
 			echo -n "."; \
 		done; \
 	else \

-- 
live-helper