From 3255f95ee9a65fe808f045e8547380a1d88b5cde Mon Sep 17 00:00:00 2001
From: Chris Forbes <chrisf@ijw.co.nz>
Date: Sat, 2 Oct 2010 15:35:48 +1300
Subject: [PATCH] ffs, more paths

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

diff --git a/packaging/package-all.sh b/packaging/package-all.sh
index d2008a6ee9..c1a231518d 100755
--- a/packaging/package-all.sh
+++ b/packaging/package-all.sh
@@ -14,10 +14,10 @@ FTPSERVER=openra.res0l.net
 
 case "$TYPE" in
     "release") 
-        FTPPATH="openra.res0l.net/openra.res0l.net/releases"
+        FTPPATH="openra.res0l.net/releases"
         ;;
     "playtest") 
-        FTPPATH="openra.res0l.net/openra.res0l.net/playtests"
+        FTPPATH="openra.res0l.net/playtests"
         ;;
     *)
         msg "\E[31m" "Unrecognized tag prefix $TYPE"
@@ -118,5 +118,5 @@ esac
 wait
 
 if [ "$TYPE" = "release" ]; then
-    wput --basename=../ -u ../VERSION ftp://$FTPPATH/master/
+    wput --basename=../ -u ../VERSION ftp://$FTPSERVER/$FTPPATH/master/
 fi
diff --git a/packaging/uploader.sh b/packaging/uploader.sh
index 09b84865fe..d0ff7b2c9b 100755
--- a/packaging/uploader.sh
+++ b/packaging/uploader.sh
@@ -8,7 +8,7 @@ VERSION=$2
 FILENAME=$3
 FTPPATH=$4
 
-FTP="ftp://$5:$6@ftp.open-ra.org/${FTPPATH}/${PLATFORM}/"
+FTP="ftp://$5:$6@openra.res0l.net/${FTPPATH}/${PLATFORM}/"
 
 if [ ! -e "${FILENAME}" ]; then
 	echo "File not found: ${FILENAME}"