From 56bd3add8abd56edaad4b51ac43ec4836462575f Mon Sep 17 00:00:00 2001
From: teastep <teastep@fbd18981-670d-0410-9b5c-8dc0c1a9a2bb>
Date: Sat, 8 Dec 2007 22:31:06 +0000
Subject: [PATCH] Modify stage and upload to only upload tar.bz2 to base/

git-svn-id: https://shorewall.svn.sourceforge.net/svnroot/shorewall/trunk@7877 fbd18981-670d-0410-9b5c-8dc0c1a9a2bb
---
 tools/build/stage  | 17 +++++++++--------
 tools/build/upload | 17 +++++++++--------
 2 files changed, 18 insertions(+), 16 deletions(-)

diff --git a/tools/build/stage b/tools/build/stage
index 679d422e0..16ee7eace 100755
--- a/tools/build/stage
+++ b/tools/build/stage
@@ -185,15 +185,16 @@ else
 	DEST=${USER}:${DEST}
 fi
 
-[ -n "$UPLOADPERL" ]   && files="$files shorewall-perl-${1}.* $perlrpm"
-[ -n "$UPLOADCOMMON" ] && files="$files shorewall-common-${1}.* $rpm"
-[ -n "$UPLOADSHELL" ]  && files="$files shorewall-shell-${1}.* $shellrpm"
-[ -n "$UPLOADLITE" ]   && files="$files shorewall-lite-${1}.* $literpm"
-[ -n "$UPLOADXML" ]    && files="$files shorewall-docs-xml-${1}.* $literpm"
-[ -n "$UPLOADHTML" ]   && files="$files shorewall-docs-html-${1}.* $literpm"
+files="errata known_problems.txt releasenotes.txt patch-$1 ${1}.*"
+base=
 
-[ -n "$BASE" ] && $COMMAND $files $DEST/base
+[ -n "$UPLOADPERL" ]   && base="shorewall-perl-${1}.tar.*" && files="$files shorewall-perl-${1}. $perlrpm"
+[ -n "$UPLOADCOMMON" ] && base="$base shorewall-common-${1}.tar.*" && files="$files shorewall-common-${1}.* $rpm"
+[ -n "$UPLOADSHELL" ]  && base="$base shorewall-shell-${1}.tar.*" && files="$files shorewall-shell-${1}.* $shellrpm"
+[ -n "$UPLOADLITE" ]   && base="$base shorewall-lite-${1}.tar.*" && files="$files shorewall-lite-${1}.* $literpm"
+[ -n "$UPLOADXML" ]    && base="$base shorewall-docs-xml-${1}.tar.*" && files="$files shorewall-docs-xml-${1}.* $literpm"
+[ -n "$UPLOADHTML" ]   && base="$base shorewall-docs-html-${1}.tar.*" && files="$files shorewall-docs-html-${1}.* $literpm"
 
-files="errata known_problems.txt releasenotes.txt patch-$1 ${1}.* $files"
+[ -n "$BASE" ] && $COMMAND $base $DEST/base
 
 $COMMAND -r $files $DEST
diff --git a/tools/build/upload b/tools/build/upload
index f55a4d709..8af226997 100755
--- a/tools/build/upload
+++ b/tools/build/upload
@@ -189,15 +189,16 @@ else
 	DEST=${USER}:${DEST}
 fi
 
-[ -n "$UPLOADPERL" ]   && files="$files shorewall-perl-${1}.* $perlrpm"
-[ -n "$UPLOADCOMMON" ] && files="$files shorewall-common-${1}.* $rpm"
-[ -n "$UPLOADSHELL" ]  && files="$files shorewall-shell-${1}.* $shellrpm"
-[ -n "$UPLOADLITE" ]   && files="$files shorewall-lite-${1}.* $literpm"
-[ -n "$UPLOADXML" ]    && files="$files shorewall-docs-xml-${1}.* $literpm"
-[ -n "$UPLOADHTML" ]   && files="$files shorewall-docs-html-${1}.* $literpm"
+files="errata known_problems.txt releasenotes.txt patch-$1 ${1}.*"
+base=
 
-[ -n "$BASE" ] && $COMMAND $files $DEST/base
+[ -n "$UPLOADPERL" ]   && base="shorewall-perl-${1}.tar.*" && files="$files shorewall-perl-${1}. $perlrpm"
+[ -n "$UPLOADCOMMON" ] && base="$base shorewall-common-${1}.tar.*" && files="$files shorewall-common-${1}.* $rpm"
+[ -n "$UPLOADSHELL" ]  && base="$base shorewall-shell-${1}.tar.*" && files="$files shorewall-shell-${1}.* $shellrpm"
+[ -n "$UPLOADLITE" ]   && base="$base shorewall-lite-${1}.tar.*" && files="$files shorewall-lite-${1}.* $literpm"
+[ -n "$UPLOADXML" ]    && base="$base shorewall-docs-xml-${1}.tar.*" && files="$files shorewall-docs-xml-${1}.* $literpm"
+[ -n "$UPLOADHTML" ]   && base="$base shorewall-docs-html-${1}.tar.*" && files="$files shorewall-docs-html-${1}.* $literpm"
 
-files="errata known_problems.txt releasenotes.txt patch-$1 ${1}.* $files"
+[ -n "$BASE" ] && $COMMAND $base $DEST/base
 
 $COMMAND -r $files $DEST