mirror of
https://gitlab.com/shorewall/code.git
synced 2024-11-15 04:04:10 +01:00
Correct handling of release notes in staging/upload scripts
git-svn-id: https://shorewall.svn.sourceforge.net/svnroot/shorewall/trunk@6875 fbd18981-670d-0410-9b5c-8dc0c1a9a2bb
This commit is contained in:
parent
82778a8b42
commit
8022728a90
@ -80,9 +80,9 @@ esac
|
|||||||
echo "There are no known problems in Shorewall version $1" > known_problems.txt
|
echo "There are no known problems in Shorewall version $1" > known_problems.txt
|
||||||
|
|
||||||
if [ -f shorewall-lite-${1}/releasenotes.txt ]; then
|
if [ -f shorewall-lite-${1}/releasenotes.txt ]; then
|
||||||
cat shorewall-common-${1}/releasenotes.txt shorewall-lite-${1}/releasenotes.txt > releasenotes.txt
|
cat $SHOREWALL-${1}/releasenotes.txt shorewall-lite-${1}/releasenotes.txt > releasenotes.txt
|
||||||
else
|
else
|
||||||
cat shorewall-common-${1}/releasenotes.txt > releasenotes.txt
|
cat $SHOREWALL-${1}/releasenotes.txt > releasenotes.txt
|
||||||
fi
|
fi
|
||||||
|
|
||||||
if [ "$HOSTNAME" = lists ]; then
|
if [ "$HOSTNAME" = lists ]; then
|
||||||
|
@ -87,4 +87,10 @@ else
|
|||||||
DEST=${USER}:${DEST}
|
DEST=${USER}:${DEST}
|
||||||
fi
|
fi
|
||||||
|
|
||||||
|
if [ -f shorewall-lite-${1}/releasenotes.txt ]; then
|
||||||
|
cat $SHOREWALL-${1} shorewall-lite-${1} > releasenotes.txt
|
||||||
|
else
|
||||||
|
cp $SHOREWALL-${1}/releasenotes.txt .
|
||||||
|
fi
|
||||||
|
|
||||||
$COMMAND -r errata known_problems.txt patch-$1 ${1}.* releasenotes.txt shorewall*${1}*.tgz* shorewall*${1}*.bz2* $rpm $literpm $perlrpm $shellrpm $DEST
|
$COMMAND -r errata known_problems.txt patch-$1 ${1}.* releasenotes.txt shorewall*${1}*.tgz* shorewall*${1}*.bz2* $rpm $literpm $perlrpm $shellrpm $DEST
|
||||||
|
Loading…
Reference in New Issue
Block a user