From 80555235d77bd673ec740148d069b7e78a970ce0 Mon Sep 17 00:00:00 2001
From: Matthew <matthew@ijw.co.nz>
Date: Sun, 15 Aug 2010 01:43:17 +1200
Subject: [PATCH] Fixes for Windows packaging.

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

diff --git a/packaging/package-all.sh b/packaging/package-all.sh
index ea5fd7c8d8..5a422e7496 100755
--- a/packaging/package-all.sh
+++ b/packaging/package-all.sh
@@ -45,11 +45,12 @@ pushd osx/
 sh package-game.sh ~/openra-package/$_gitname-build "$VERSION"
 popd
 
-sh uploader.sh osx "$VERSION" ~/openra-package/$_gitname-build/osxbuild/OpenRA-$VERSION.zip "$2" "$3"
+./uploader.sh osx "$VERSION" ~/openra-package/$_gitname-build/osxbuild/OpenRA-$VERSION.zip "$2" "$3"
 
 pushd windows/
-makensis -DSRCDIR=~/openra-package/$_gitname-build OpenRA.nsi
+makensis -DSRCDIR=/home/openra/openra-package/$_gitname-build OpenRA.nsi
 mv OpenRA.exe OpenRA-$VERSION.exe
+../uploader.sh windows "$VERSION" OpenRA-$VERSION.exe "$2" "$3"
 popd
 
-sh uploader.sh windows "$VERSION" windows/OpenRA-$VERSION.exe
+
diff --git a/packaging/uploader.sh b/packaging/uploader.sh
index 591154bd2b..e7a1875ef2 100755
--- a/packaging/uploader.sh
+++ b/packaging/uploader.sh
@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/bin/bash
 # OpenRA Package uploader script
 # Usage: uploader.sh <platform> <version string> <package file>
 #    Will upload as user openra and prompt for a password if it's not defined in ~/.netrc