From d1d664ed978343cff5044d20b84ec5516828fc29 Mon Sep 17 00:00:00 2001 From: teastep Date: Mon, 16 Jul 2007 20:19:30 +0000 Subject: [PATCH] Fix upload script git-svn-id: https://shorewall.svn.sourceforge.net/svnroot/shorewall/trunk@6887 fbd18981-670d-0410-9b5c-8dc0c1a9a2bb --- tools/build/upload | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/tools/build/upload b/tools/build/upload index 6cd3af3b6..f29c8da71 100755 --- a/tools/build/upload +++ b/tools/build/upload @@ -79,6 +79,12 @@ esac echo "There are no known problems in Shorewall version $1" > known_problems.txt +if [ -f shorewall-lite-${1}/releasenotes.txt ]; then + cat $SHOREWALL-${1}/releasenotes.txt shorewall-lite-${1}/releasenotes.txt > releasenotes.txt +else + cat $SHOREWALL-${1}/releasenotes.txt > releasenotes.txt +fi + if [ "$HOSTNAME" = lists ]; then mkdir -p $DEST COMMAND=cp @@ -87,10 +93,4 @@ else DEST=${USER}:${DEST} 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