Fix upload and stage for latest partial build update

git-svn-id: https://shorewall.svn.sourceforge.net/svnroot/shorewall/trunk@7803 fbd18981-670d-0410-9b5c-8dc0c1a9a2bb
This commit is contained in:
teastep 2007-11-29 21:41:17 +00:00
parent 0421f15d82
commit 204117e1f2
2 changed files with 12 additions and 4 deletions

View File

@ -20,6 +20,7 @@ UPLOADSHELL=
UPLOADLITE= UPLOADLITE=
UPLOADXML= UPLOADXML=
UPLOADHTML= UPLOADHTML=
PARTIAL=Yes
done= done=
@ -33,6 +34,7 @@ case $1 in
UPLOADLITE=Yes UPLOADLITE=Yes
UPLOADXML=Yes UPLOADXML=Yes
UPLOADHTML=Yes UPLOADHTML=Yes
PARTIAL=
done=Yes done=Yes
;; ;;
esac esac
@ -161,10 +163,12 @@ esac
[ -f known_problems.txt ] || echo "There are no known problems in Shorewall version $1" > known_problems.txt [ -f known_problems.txt ] || echo "There are no known problems in Shorewall version $1" > known_problems.txt
[ -n "$PARTIAL" ] && SHOREWALLDIR=shorewall-common || SHOREWALLDIR=$SHOREWALL-${1}
if [ -f shorewall-lite-${1}/releasenotes.txt ]; then if [ -f shorewall-lite-${1}/releasenotes.txt ]; then
cat $SHOREWALL-${1}/releasenotes.txt shorewall-lite-${1}/releasenotes.txt > releasenotes.txt cat $SHOREWALLDIR/releasenotes.txt shorewall-lite-${1}/releasenotes.txt > releasenotes.txt
else else
cat $SHOREWALL-${1}/releasenotes.txt > releasenotes.txt cat $SHOREWALLDIR/releasenotes.txt > releasenotes.txt
fi fi
if [ "$HOSTNAME" = lists ]; then if [ "$HOSTNAME" = lists ]; then

View File

@ -20,6 +20,7 @@ UPLOADSHELL=
UPLOADLITE= UPLOADLITE=
UPLOADXML= UPLOADXML=
UPLOADHTML= UPLOADHTML=
PARTIAL=Yes
done= done=
@ -33,6 +34,7 @@ case $1 in
UPLOADLITE=Yes UPLOADLITE=Yes
UPLOADXML=Yes UPLOADXML=Yes
UPLOADHTML=Yes UPLOADHTML=Yes
PARTIAL=
done=Yes done=Yes
;; ;;
esac esac
@ -161,10 +163,12 @@ esac
[ -f known_problems.txt ] || echo "There are no known problems in Shorewall version $1" > known_problems.txt [ -f known_problems.txt ] || echo "There are no known problems in Shorewall version $1" > known_problems.txt
[ -n "$PARTIAL" ] && SHOREWALLDIR=shorewall-common || SHOREWALLDIR=$SHOREWALL-${1}
if [ -f shorewall-lite-${1}/releasenotes.txt ]; then if [ -f shorewall-lite-${1}/releasenotes.txt ]; then
cat $SHOREWALL-${1}/releasenotes.txt shorewall-lite-${1}/releasenotes.txt > releasenotes.txt cat $SHOREWALLDIR/releasenotes.txt shorewall-lite-${1}/releasenotes.txt > releasenotes.txt
else else
cat $SHOREWALL-${1}/releasenotes.txt > releasenotes.txt cat $SHOREWALLDIR/releasenotes.txt > releasenotes.txt
fi fi
if [ "$HOSTNAME" = lists ]; then if [ "$HOSTNAME" = lists ]; then