- Unify output redirection
Signed-off-by: Matt Darfeuille <[email protected]>
---
build/build50 | 8 ++++++--
1 file changed, 6 insertions(+), 2 deletions(-)
diff --git a/build/build50 b/build/build50
index b03aae46..0731e7d8 100755
--- a/build/build50
+++ b/build/build50
@@ -895,7 +895,7 @@ if [ -n
"${BUILDCORE}${BUILD6}${BUILDINIT}${BUILDLITE}${BUILD6LITE}${BUILDSTD}"
manpagedir=$PWD/manpages
- pushd Samples6 2> /dev/null
+ pushd Samples6 > /dev/null
for dir in *; do
if [ -d $dir ]; then
@@ -903,7 +903,11 @@ if [ -n
"${BUILDCORE}${BUILD6}${BUILDINIT}${BUILDLITE}${BUILD6LITE}${BUILDSTD}"
progress_message "*** $PWD ***"
if [ -n "$CONSOLIDATED" ]; then
- do_configfiles $PWD $BASEDIR/$SHOREWALLDIR/manpages ''
+ if [ -d $BASEDIR/$VERSION/$SHOREWALLDIR/manpages ]; then
+ do_configfiles $PWD
$BASEDIR/$VERSION/$SHOREWALLDIR/manpages ''
+ else
+ do_configfiles $PWD $BASEDIR/$SHOREWALLDIR/manpages ''
+ fi
else
do_configfiles $PWD $manpagedir 6
fi
--
2.11.0
_______________________________________________
Shorewall-devel mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/shorewall-devel
