Signed-off-by: Matt Darfeuille <[email protected]>
---
build/build50 | 18 ++++++++++++------
1 file changed, 12 insertions(+), 6 deletions(-)
diff --git a/build/build50 b/build/build50
index e458efa..0191c3c 100755
--- a/build/build50
+++ b/build/build50
@@ -366,7 +366,7 @@ setperlversions()
cleanpatch()
{
do_or_die mv $1 tmppatch
- do_or_die cleanpatch.pl tmppatch > $1
+ do_or_die $TOOLSDIR/cleanpatch.pl tmppatch > $1
}
################################################################################
@@ -1241,6 +1241,10 @@ if [ -n "$OLDVERSION" ]; then
[ -d shorewall-lite-$VERSION ] && [ -d shorewall-lite-$OLDVERSION ]
&& diff -Naurd -X $TOOLSDIR/exclude.txt shorewall-lite-$OLDVERSION
shorewall-lite-$VERSION > patch-lite-$VERSION || true
[ -d shorewall-init-$VERSION ] && [ -d shorewall-init-$OLDVERSION ]
&& diff -Naurd -X $TOOLSDIR/exclude.txt shorewall-init-$OLDVERSION
shorewall-init-$VERSION > patch-init-$VERSION || true
[ -d shorewall6-lite-$VERSION ] && [ -d shorewall6-lite-$OLDVERSION ]
&& diff -Naurd -X $TOOLSDIR/exclude.txt shorewall6-lite-$OLDVERSION
shorewall6-lite-$VERSION > patch-6-lite-$VERSION || true
+
+ for f in patch*-$VERSION; do
+ cleanpatch $f
+ done
else
cd $BASEDIR
@@ -1251,12 +1255,14 @@ if [ -n "$OLDVERSION" ]; then
[ -d $VERSION/shorewall-init-$VERSION ] && [ -d
$OLDVERSION/shorewall-init-$OLDVERSION ] && diff -Naurdw -X
$TOOLSDIR/exclude.txt $OLDVERSION/shorewall-init-$OLDVERSION
$VERSION/shorewall-init-$VERSION > $VERSION/patch-init-$VERSION || true
[ -d $VERSION/shorewall6-lite-$VERSION ] && [ -d
$OLDVERSION/shorewall6-lite-$OLDVERSION ] && diff -Naurdw -X
$TOOLSDIR/exclude.txt $OLDVERSION/shorewall6-lite-$OLDVERSION
$VERSION/shorewall6-lite-$VERSION > $VERSION/patch-6-lite-$VERSION || true
- cd ..
- fi
+ cd $VERSION
- for f in patch*-$VERSION; do
- cleanpatch $f
- done
+ for f in patch*-$VERSION; do
+ cleanpatch $f
+ done
+
+ cd ../..
+ fi
fi
progress_message "Shorewall $VERSION Build complete - $(date)"
--
2.8.3
------------------------------------------------------------------------------
Announcing the Oxford Dictionaries API! The API offers world-renowned
dictionary content that is easy and intuitive to access. Sign up for an
account today to start using our lexical data to power your apps and
projects. Get started today and enter our developer competition.
http://sdm.link/oxford
_______________________________________________
Shorewall-devel mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/shorewall-devel
