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:
teastep 2007-07-16 00:20:51 +00:00
parent 82778a8b42
commit 8022728a90
2 changed files with 8 additions and 2 deletions

View File

@ -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

View File

@ -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