From 1b525ff8099f4e8b4624f1b8757c676a5160dcc7 Mon Sep 17 00:00:00 2001
From: Matthew <matthew@ijw.co.nz>
Date: Mon, 4 Oct 2010 11:46:05 +1300
Subject: [PATCH] Export FTP server and added username/password to VERSION file
 upload.

---
 packaging/package-all.sh | 4 +++-
 packaging/uploader.sh    | 2 +-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/packaging/package-all.sh b/packaging/package-all.sh
index c1a231518d..1e8cb0cf83 100755
--- a/packaging/package-all.sh
+++ b/packaging/package-all.sh
@@ -12,6 +12,8 @@ VERSION=`echo $TAG | grep -o "[0-9]\\+-\\?[0-9]\\?"`
 
 FTPSERVER=openra.res0l.net
 
+export FTPSERVER
+
 case "$TYPE" in
     "release") 
         FTPPATH="openra.res0l.net/releases"
@@ -118,5 +120,5 @@ esac
 wait
 
 if [ "$TYPE" = "release" ]; then
-    wput --basename=../ -u ../VERSION ftp://$FTPSERVER/$FTPPATH/master/
+    wput --basename=../ -u ../VERSION ftp://$2:$3@$FTPSERVER/$FTPPATH/master/
 fi
diff --git a/packaging/uploader.sh b/packaging/uploader.sh
index 3a55478f3c..a3e9a0d36e 100755
--- a/packaging/uploader.sh
+++ b/packaging/uploader.sh
@@ -8,7 +8,7 @@ VERSION=$2
 FILENAME=$3
 FTPPATH=$4
 
-FTP="ftp://$5:$6@openra.res0l.net/${FTPPATH}/${PLATFORM}/"
+FTP="ftp://$5:$6@${FTPSERVER}/${FTPPATH}/${PLATFORM}/"
 
 if [ ! -e "${FILENAME}" ]; then
 	echo "File not found: ${FILENAME}"