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 c5af5ce42441c934bbb6fbe414ea0d9b2b170fca..8aeaa7e0eec6e5c7eb09cd1d5b9a48028c573b2d 100755 (executable)
--- a/scripts/source-maintenance.sh
+++ b/scripts/source-maintenance.sh
@@ -37,12 +37,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
 
@@ -133,7 +135,7 @@ for FILENAME in `ls -1`; do
 
     esac
 
-    if test "$FILENAME" = "libltdl" ; then
+    if test "$FILENAME" = "libltdl/" ; then
         :
     elif test -d $FILENAME ; then
        cd $FILENAME