mirror of
https://gitlab.com/shorewall/code.git
synced 2024-11-28 02:23:20 +01:00
More fixes for partial builds/uploads
This commit is contained in:
parent
7211569197
commit
09b9bfa914
@ -129,6 +129,16 @@ case $1 in
|
||||
lite6rpm=shorewall6-lite-${1%-*}-0${1#*-}.noarch.rpm
|
||||
BASE=Yes
|
||||
;;
|
||||
4.4.*.*)
|
||||
BASEVERSION=${1%.*}
|
||||
PATCHNUM=${1##*.}
|
||||
DEST="/srv/ftp/pub/shorewall/${BASEVERSION%.*}/shorewall-${BASEVERSION}"
|
||||
SHOREWALL=shorewall
|
||||
rpm=shorewall-${BASEVERSION}-${PATCHNUM}.noarch.rpm
|
||||
rpm6=shorewall6-${BASEVERSION}-${PATCHNUM}.noarch.rpm
|
||||
literpm=shorewall-lite-${BASEVERSION}-${PATCHNUM}.noarch.rpm
|
||||
lite6rpm=shorewall6-lite-${BASEVERSION}-${PATCHNUM}.noarch.rpm
|
||||
;;
|
||||
4.4.*)
|
||||
DEST="/srv/ftp/pub/private/${1%.*}/shorewall-$1"
|
||||
SHOREWALL=shorewall
|
||||
@ -155,9 +165,7 @@ fi
|
||||
|
||||
[ -f known_problems.txt ] || echo "There are no known problems in Shorewall version $1" > known_problems.txt
|
||||
|
||||
[ -n "$PARTIAL" -a -z "$STAGECOMMON" ] && SHOREWALLDIR=shorewall || SHOREWALLDIR=$SHOREWALL-${1}
|
||||
|
||||
cp $SHOREWALLDIR/releasenotes.txt releasenotes.txt
|
||||
cp $SHOREWALL-${1}/releasenotes.txt releasenotes.txt
|
||||
|
||||
if [ "$HOSTNAME" = lists ]; then
|
||||
mkdir -p $DEST
|
||||
@ -169,7 +177,7 @@ else
|
||||
DEST=${USER}:${DEST}
|
||||
fi
|
||||
|
||||
files="errata known_problems.txt releasenotes.txt patch-*-$1 ${1}.*"
|
||||
files="errata known_problems.txt releasenotes.txt patch*-$1 ${1}.*"
|
||||
base=
|
||||
|
||||
rm -f *-${1}*.asc
|
||||
|
@ -165,7 +165,7 @@ fi
|
||||
|
||||
[ -f known_problems.txt ] || echo "There are no known problems in Shorewall version $1" > known_problems.txt
|
||||
|
||||
cp $SHOREWALLDIR-${1}/releasenotes.txt releasenotes.txt
|
||||
cp $SHOREWALL-${1}/releasenotes.txt releasenotes.txt
|
||||
|
||||
if [ "$HOSTNAME" = lists ]; then
|
||||
mkdir -p $DEST
|
||||
|
Loading…
Reference in New Issue
Block a user