forked from extern/shorewall_code
Fix ArTourter's Shorewall6 install.sh
git-svn-id: https://shorewall.svn.sourceforge.net/svnroot/shorewall/trunk@9500 fbd18981-670d-0410-9b5c-8dc0c1a9a2bb
This commit is contained in:
parent
c1bc552790
commit
30c25437c2
@ -151,7 +151,7 @@ fi
|
||||
|
||||
DEBIAN=
|
||||
CYGWIN=
|
||||
MANDIR=$(MANDIR:-"/usr/share/man")
|
||||
MANDIR=${MANDIR:-"/usr/share/man"}
|
||||
|
||||
case $(uname) in
|
||||
CYGWIN*)
|
||||
|
@ -620,7 +620,7 @@ if [ -n "${BUILDTARBALL}${BUILDRPM}" ]; then
|
||||
progress_message "Building $RPMNAME..."
|
||||
|
||||
cd /tmp
|
||||
rm -rf shorewall-common-${BASEVERSION}
|
||||
rm -rf shorewall-${BASEVERSION}
|
||||
do_or_die "cp -a $DIR/$SHOREWALLDIR shorewall-${BASEVERSION}"
|
||||
do_or_die "tar -zcf $RPMDIR/SOURCES/shorewall-${BASEVERSION}.tgz shorewall-${BASEVERSION}"
|
||||
cd $DIR
|
||||
@ -906,7 +906,7 @@ if [ -n "$OLDVERSION" ]; then
|
||||
|
||||
progress_message "Creating patch-$VERSION ..."
|
||||
|
||||
[ -d shorewall$VERSION ] && diff -Naur -X $(dirname $0)/exclude.txt shorewall-common-$OLDVERSION shorewall-common-$VERSION > patch-common-$VERSION || true
|
||||
[ -d shorewall$VERSION ] && diff -Naur -X $(dirname $0)/exclude.txt shorewall-$OLDVERSION shorewall-$VERSION > patch-$VERSION || true
|
||||
[ -d shorewall6-$VERSION ] && diff -Naur -X $(dirname $0)/exclude.txt shorewall6-$OLDVERSION shorewall6-$VERSION > patch-6-$VERSION || true
|
||||
[ -d shorewall-lite-$VERSION ] && diff -Naur -X $(dirname $0)/exclude.txt shorewall-lite-$OLDVERSION shorewall-lite-$VERSION > patch-lite-$VERSION || true
|
||||
[ -d shorewall6-lite-$VERSION ] && diff -Naur -X $(dirname $0)/exclude.txt shorewall6-lite-$OLDVERSION shorewall6-lite-$VERSION > patch-6-lite-$VERSION || true
|
||||
|
Loading…
Reference in New Issue
Block a user