From 1109700746d282135a4d4be0f4f54247d78d9893 Mon Sep 17 00:00:00 2001 From: "squidadm@squid-cache.org" <> Date: Sat, 20 Dec 2014 07:09:43 +0000 Subject: [PATCH] source-maintenance.sh: only check astyle version once --- scripts/source-maintenance.sh | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/scripts/source-maintenance.sh b/scripts/source-maintenance.sh index 3891594a2b..5782d4b455 100755 --- a/scripts/source-maintenance.sh +++ b/scripts/source-maintenance.sh @@ -33,7 +33,8 @@ ROOT=`bzr root` ASVER=`astyle --version 2>&1 | grep -o -E "[0-9.]+"` if test "${ASVER}" != "2.03" ; then - echo "Astyle version problem. You have ${ASVER} instead of 2.03"; + echo "Astyle version problem. You have ${ASVER} instead of 2.03" + ASVER="" else echo "Found astyle ${ASVER}. Formatting..." fi @@ -63,7 +64,7 @@ for FILENAME in `bzr ls --versioned`; do # # Code Style formatting maintenance # - if test "${ASVER}" = "1.23"; then + if test "${ASVER}"; then ${ROOT}/scripts/formater.pl ${FILENAME} if test -e $FILENAME -a -e "$FILENAME.astylebak"; then md51=`cat $FILENAME| tr -d "\n \t\r" | $MD5`; -- 2.47.2