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 2f229f8f3a4779839e3b86a4469ced7f53838c9d..8e2ce0561180bd83b262b0abe01f7c43e480f3ac 100755 (executable)
--- 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