mirror of
https://gitlab.com/shorewall/code.git
synced 2025-06-20 17:58:07 +02:00
Only mangle filenames in patch if patch release
git-svn-id: https://shorewall.svn.sourceforge.net/svnroot/shorewall/trunk@7749 fbd18981-670d-0410-9b5c-8dc0c1a9a2bb
This commit is contained in:
parent
f715a8b0e5
commit
a97517c364
@ -108,6 +108,7 @@ BUILDCOMMON=
|
|||||||
BUILDPERL=
|
BUILDPERL=
|
||||||
BUILDSHELL=
|
BUILDSHELL=
|
||||||
BUILDLITE=
|
BUILDLITE=
|
||||||
|
PATCHRELEASE=
|
||||||
################################################################################
|
################################################################################
|
||||||
# F U N C T I O N S
|
# F U N C T I O N S
|
||||||
################################################################################
|
################################################################################
|
||||||
@ -335,6 +336,7 @@ case $VERSION in
|
|||||||
#
|
#
|
||||||
# Patch Release
|
# Patch Release
|
||||||
#
|
#
|
||||||
|
PATCHRELEASE=Yes
|
||||||
SHOREWALLDIR=shorewall-common-${VERSION%-*}
|
SHOREWALLDIR=shorewall-common-${VERSION%-*}
|
||||||
SHOREWALLLITEDIR=shorewall-lite-${VERSION%-*}
|
SHOREWALLLITEDIR=shorewall-lite-${VERSION%-*}
|
||||||
TARBALL=shorewall-common-${VERSION%-*}.tgz
|
TARBALL=shorewall-common-${VERSION%-*}.tgz
|
||||||
@ -907,7 +909,7 @@ if [ -n "$OLDVERSION" ]; then
|
|||||||
[ -n "$BUILDPERL" ] && diff -Naur -X $(dirname $0)/exclude.txt shorewall-perl-$OLDVERSION shorewall-perl-$VERSION >> patch-$VERSION || true
|
[ -n "$BUILDPERL" ] && diff -Naur -X $(dirname $0)/exclude.txt shorewall-perl-$OLDVERSION shorewall-perl-$VERSION >> patch-$VERSION || true
|
||||||
[ -n "$BUILDSHELL" ] && diff -Naur -X $(dirname $0)/exclude.txt shorewall-shell-$OLDVERSION shorewall-shell-$VERSION >> patch-$VERSION || true
|
[ -n "$BUILDSHELL" ] && diff -Naur -X $(dirname $0)/exclude.txt shorewall-shell-$OLDVERSION shorewall-shell-$VERSION >> patch-$VERSION || true
|
||||||
|
|
||||||
eval perl -i -p -e "'if ( /\+\+\+/ ) { s/shorewall-common-$VERSION/Shorewall-common/;s/shorewall-lite-$VERSION/Shorewall-lite/;s/shorewall-perl-$VERSION/Shorewall-perl/;s/shorewall-shell-$VERSION/Shorewall-shell/ }'" patch-$VERSION
|
[ -n "$PATCHRELEASE" ] && eval perl -i -p -e "'if ( /\+\+\+/ ) { s/shorewall-common-$VERSION/Shorewall-common/;s/shorewall-lite-$VERSION/Shorewall-lite/;s/shorewall-perl-$VERSION/Shorewall-perl/;s/shorewall-shell-$VERSION/Shorewall-shell/ }'" patch-$VERSION
|
||||||
|
|
||||||
fi
|
fi
|
||||||
|
|
||||||
|
@ -2,4 +2,5 @@ releasenotes.txt
|
|||||||
changelog.txt
|
changelog.txt
|
||||||
*.5
|
*.5
|
||||||
*.8
|
*.8
|
||||||
|
*.spec
|
||||||
diff*
|
diff*
|
||||||
|
Loading…
x
Reference in New Issue
Block a user