From dd7e92112e0d207e0d4e63054d240e445a41a695 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Matthias=20Mail=C3=A4nder?= <matthias@mailaender.name>
Date: Thu, 5 Jun 2014 10:22:42 +0200
Subject: [PATCH] one at a time

---
 packaging/linux/buildpackage.sh | 45 ++++++++++++++---------------
 packaging/package-all.sh        | 51 +++++++++++++++------------------
 2 files changed, 44 insertions(+), 52 deletions(-)

diff --git a/packaging/linux/buildpackage.sh b/packaging/linux/buildpackage.sh
index e399eb8cf6..baf2c87d2d 100755
--- a/packaging/linux/buildpackage.sh
+++ b/packaging/linux/buildpackage.sh
@@ -38,32 +38,29 @@ cp *.html $PWD/packaging/linux/$ROOTDIR/usr/share/doc/openra/
 
 cd packaging/linux
 
-(
-    echo "Building Debian package."
-    cd deb
-    ./buildpackage.sh "$TAG" ../$ROOTDIR "$PACKAGEDIR"
-    if [ $? -ne 0 ]; then
-        echo "Debian package build failed."
-    fi
-) &
+pushd deb
+echo "Building Debian package."
+./buildpackage.sh "$TAG" ../$ROOTDIR "$PACKAGEDIR"
+if [ $? -ne 0 ]; then
+    echo "Debian package build failed."
+fi
+popd
 
-(
-    echo "Building Arch-Linux package."
-    cd pkgbuild
-    sh buildpackage.sh "$TAG" ../$ROOTDIR "$PACKAGEDIR"
-    if [ $? -ne 0 ]; then
-        echo "Arch-Linux package build failed."
-    fi
-) &
+pushd pkgbuild
+echo "Building Arch-Linux package."
+sh buildpackage.sh "$TAG" ../$ROOTDIR "$PACKAGEDIR"
+if [ $? -ne 0 ]; then
+    echo "Arch-Linux package build failed."
+fi
+popd
 
-(
-    echo "Building RPM package."
-    cd rpm
-    sh buildpackage.sh "$TAG" ../$ROOTDIR ~/rpmbuild "$PACKAGEDIR"
-    if [ $? -ne 0 ]; then
-        echo "RPM package build failed."
-    fi
-) &
+pushd rpm
+echo "Building RPM package."
+sh buildpackage.sh "$TAG" ../$ROOTDIR ~/rpmbuild "$PACKAGEDIR"
+if [ $? -ne 0 ]; then
+    echo "RPM package build failed."
+fi
+popd
 
 wait
 
diff --git a/packaging/package-all.sh b/packaging/package-all.sh
index 1d438c9b75..20eee32c9c 100755
--- a/packaging/package-all.sh
+++ b/packaging/package-all.sh
@@ -74,40 +74,35 @@ cp thirdparty/RestSharp.dll packaging/built
 # Copy game icon for windows package
 cp OpenRA.Game/OpenRA.ico packaging/built
 
-#
-# Change into packaging directory and run the 
-# platform-dependant packaging in parallel
-#
 cd packaging
 echo "Creating packages..."
 
-(
-    cd windows
-    makensis -DSRCDIR="$BUILTDIR" -DDEPSDIR="${SRCDIR}/thirdparty/windows" OpenRA.nsi
-    if [ $? -eq 0 ]; then
-        mv OpenRA.exe "$OUTPUTDIR"/OpenRA-$TAG.exe
-    else
-        echo "Windows package build failed."
-    fi
-) &
+pushd windows
+echo "Building Windows setup.exe"
+makensis -DSRCDIR="$BUILTDIR" -DDEPSDIR="${SRCDIR}/thirdparty/windows" OpenRA.nsi
+if [ $? -eq 0 ]; then
+    mv OpenRA.exe "$OUTPUTDIR"/OpenRA-$TAG.exe
+else
+    echo "Windows package build failed."
+fi
+popd
 
-(
-    cd osx
-    sh buildpackage.sh "$TAG" "$BUILTDIR" "${SRCDIR}/thirdparty/osx" "$OUTPUTDIR"
-    if [ $? -ne 0 ]; then
-        echo "OS X package build failed."
-    fi
-) &
+pushd osx
+echo "Zipping OS X package"
+sh buildpackage.sh "$TAG" "$BUILTDIR" "${SRCDIR}/thirdparty/osx" "$OUTPUTDIR"
+if [ $? -ne 0 ]; then
+    echo "OS X package build failed."
+fi
+popd
 
-(
-    cd linux
-    sh buildpackage.sh "$TAG" "$BUILTDIR" "${SRCDIR}/thirdparty/linux" "$OUTPUTDIR"
-    if [ $? -ne 0 ]; then
-        echo "Linux package build failed."
-    fi
-) &
+pushd linux
+echo "Building Linux packages"
+sh buildpackage.sh "$TAG" "$BUILTDIR" "${SRCDIR}/thirdparty/linux" "$OUTPUTDIR"
+if [ $? -ne 0 ]; then
+    echo "Linux package build failed."
+fi
+popd
 
-wait
 echo "Package build done."
 
 rm -rf $BUILTDIR