From: Michael Tremer <michael.tremer@ipfire.org>
Date: Mon, 19 Jan 2009 14:43:16 +0000 (+0100)
Subject: Rewrote rootfiles check code so that it threads symlinks correctly.
X-Git-Tag: v3.0-alpha1~85^2~12
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=f32c5bcba1684050a12ac2eb9032639b04e41836;p=ipfire-3.x.git

Rewrote rootfiles check code so that it threads symlinks correctly.
---

diff --git a/tools/make-check b/tools/make-check
index 50ef652cc..76c64d43b 100644
--- a/tools/make-check
+++ b/tools/make-check
@@ -91,12 +91,14 @@ check_rootfiles() {
 
 	echo -n " Running rootfile checks"
 
+	ROOTFILES=$(find $BASEDIR/src/rootfiles/{core,extras,debug}/ -type f)
+
 	case "$ACTION" in
 		--fix)
 			echo -n " and fix"
 
 			# Remove leading pluses and replace them by '#'
-			for i in $BASEDIR/src/rootfiles/{core,extras,debug}/*{,/*}; do
+			for i in $ROOTFILES; do
 				[ ! -f $i ] && continue
 				sed -e "s/^+/#/g" -i $i
 			done
@@ -109,29 +111,31 @@ check_rootfiles() {
 			;;
 	esac
 
-	echo "..." # End the line
-
-	echo -n "  Searching for leading slashes..."
-	if grep -n ^/ $BASEDIR/src/rootfiles/*/*{,/*}; then
-		exiterror "Please check your rootfiles! There are leading slashes."
-	else
-		beautify message DONE
-	fi
+	echo -n "..." # End the line
 
-	echo -n "  Searching for leading pluses..."
-	if grep -n ^+ $BASEDIR/src/rootfiles/*/*{,/*}; then
-		exiterror "Please check your rootfiles for leading pluses."
-	else
-		beautify message DONE
-	fi
+	for i in $ROOTFILES; do
+		# Leading slashes
+		grep -q ^/ $i
+		if [ "$?" -eq "0" ]; then
+			dialogerror "Please check your rootfile of \"$(basename $i)\" for leading slashes."
+			exit 1
+		fi
 
-	echo -n "  Searching for emtpy lines..."
-	if grep -n ^$ $BASEDIR/src/rootfiles/*/*{,/*}; then
-		exiterror "Please check your rootfiles for empty lines."
-	else
-		beautify message DONE
-	fi
+		# Leading plusses
+		grep -q ^+ $i
+		if [ "$?" -eq "0" ]; then
+			dialogerror "Please check your rootfile of \"$(basename $i)\" for leading plusses."
+			exit 1
+		fi
 
+		# Empty lines
+		grep -q ^$ $i
+		if [ "$?" -eq "0" ]; then
+			dialogerror "Please check your rootiles of \"$(basename $i)\" for empty lines."
+			exit 1
+		fi
+	done
+	beautify message DONE
 }
 
 check_code() {