From d6a159b2830ef073d306698b49d27a9e7ec23455 Mon Sep 17 00:00:00 2001
From: teastep <teastep@fbd18981-670d-0410-9b5c-8dc0c1a9a2bb>
Date: Sat, 24 Nov 2007 20:41:01 +0000
Subject: [PATCH] Fix a couple of bugs

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

diff --git a/tools/build/stage b/tools/build/stage
index c2fad4827..e463330e5 100755
--- a/tools/build/stage
+++ b/tools/build/stage
@@ -2,6 +2,7 @@
 
 usage() {
     echo "Usage: stage [-pclsxh] <version>"
+}
 
 rpm=
 literpm=
@@ -81,9 +82,9 @@ while [ -z "$done" ]; do
 	    ;;
 	*)
 	    done=Yes
-	    ;;
+            ;;
     esac
-done
+ done
 
 
 case $1 in
@@ -96,7 +97,7 @@ case $1 in
 	shellrpm=shorewall-shell-${1%-*}-0${1#*-}.noarch.rpm
 	;;
     4.0.*-*)
-	DEST="/srv/ftp/pub/shorewall/development/staging/${1%.*}/shorewall-${1%-*}"
+	DEST="/srv/ftp/pub/shorewall/development/staging/${1%.*}/shorewall-${1}"
 	SHOREWALL=shorewall-common
 	;;
     4.0.*)
diff --git a/tools/build/upload b/tools/build/upload
index ad49fec3e..bb238b1dd 100755
--- a/tools/build/upload
+++ b/tools/build/upload
@@ -2,6 +2,7 @@
 
 usage() {
     echo "Usage: upload [-pclsxh] <version>"
+}
 
 rpm=
 literpm=