From: Alex Rousskov <rousskov@measurement-factory.com>
Date: Sat, 11 Oct 2014 11:05:13 +0000 (-0700)
Subject: Bug 4093: source-maintenance.sh errors and warnings due to wrong tools/options
X-Git-Tag: merge-candidate-3-v1~552
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=1a8e2e1ce4ca5df603943c4a178e413d9630cf83;p=thirdparty%2Fsquid.git

Bug 4093: source-maintenance.sh errors and warnings due to wrong tools/options
---

diff --git a/scripts/source-maintenance.sh b/scripts/source-maintenance.sh
index 2f229f8f3a..8e2ce05611 100755
--- a/scripts/source-maintenance.sh
+++ b/scripts/source-maintenance.sh
@@ -46,12 +46,14 @@ PWD=`pwd`
 #
 # Scan for incorrect use of #ifdef/#ifndef
 #
-grep -E "ifn?def .*_SQUID_" ./*.* | grep -v -E "_H$" | while read f; do echo "PROBLEM?: ${PWD} ${f}"; done
+bzr grep --no-recursive "ifn?def .*_SQUID_" |
+    grep -v -E "_H$" |
+    while read f; do echo "PROBLEM?: ${PWD} ${f}"; done
 
 #
 # Scan for file-specific actions
 #
-for FILENAME in `ls -1`; do
+for FILENAME in `bzr ls --versioned`; do
 
     case ${FILENAME} in
 
@@ -162,7 +164,7 @@ for FILENAME in `ls -1`; do
         fi
     fi
 
-    if test "$FILENAME" = "libltdl" ; then
+    if test "$FILENAME" = "libltdl/" ; then
         :
     elif test -d $FILENAME ; then
 	cd $FILENAME