From 70b67c69d8d89b3f188a28d799be11e9bfbf1e1b Mon Sep 17 00:00:00 2001
From: teastep <teastep@fbd18981-670d-0410-9b5c-8dc0c1a9a2bb>
Date: Sat, 14 Jul 2007 14:56:49 +0000
Subject: [PATCH] Allow the update and stage scripts to run on the primary
 server -- take 2

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

diff --git a/tools/build/stage b/tools/build/stage
index 5ea62b5f2..a5fadf32e 100755
--- a/tools/build/stage
+++ b/tools/build/stage
@@ -6,7 +6,7 @@ perldir=
 shelldir=
 
 DEST=
-USER="webmin@mail.shorewall.net:"
+USER="webmin@mail.shorewall.net"
 SHOREWALL=shorewall
 COMMAND=scp
 
@@ -44,7 +44,8 @@ case $1 in
 	rpm=shorewall-${1}-1.noarch.rpm
 	;;
     3.*Beta*|*RC*)
-	DEST="/srv/ftp/pub/shorewall/development/staging/${1%.*}/shorewall-$1"
+	DEST="/srv/ftp/pub/shorewall/development	$DEST=${USER}${DEST}
+/staging/${1%.*}/shorewall-$1"
 	rpm=shorewall-${1%-*}-0${1#*-}.noarch.rpm
 	literpm=shorewall-lite-${1%-*}-0${1#*-}.noarch.rpm
 	;;
@@ -90,7 +91,7 @@ if [ "$HOSTNAME" = lists ]; then
 	COMMAND=cp
 else
 	ssh $USER mkdir -p $DEST
-	$DEST=${USER}${DEST}
+	$DEST=${USER}:${DEST}
 fi
 
 $COMMAND -r errata known_problems.txt patch-$1 ${1}.* releasenotes.txt shorewall*${1}*.tgz* shorewall*${1}*.bz2* $rpm $literpm $perlrpm $shellrpm $DEST
diff --git a/tools/build/upload b/tools/build/upload
index 359f56982..10f7ff23f 100755
--- a/tools/build/upload
+++ b/tools/build/upload
@@ -6,7 +6,7 @@ perlrpm=
 shellrpm=
 
 DEST=
-USER="webmin@mail.shorewall.net:"
+USER="webmin@mail.shorewall.net"
 SHOREWALL=shorewall
 COMMAND=scp
 
@@ -84,6 +84,7 @@ if [ "$HOSTNAME" = lists ]; then
 	COMMAND=cp
 else
 	ssh $USER mkdir -p $DEST
+	$DEST=${USER}:${DEST}
 fi
 
 $COMMAND -r errata known_problems.txt patch-$1 ${1}.* releasenotes.txt shorewall*${1}*.tgz* shorewall*${1}*.bz2* $rpm $literpm $perlrpm $shellrpm $DEST