From 4dd25d49362f60c2c8f04555fe0a6612f5d74ee1 Mon Sep 17 00:00:00 2001
From: Paul Chote <paul@chote.net>
Date: Wed, 7 Jul 2010 22:14:12 +1200
Subject: [PATCH] Polish

---
 packaging/osx/OpenRA.app/Contents/MacOS/OpenRA       | 12 +++++++++---
 .../osx/OpenRA.app/Contents/MacOS/display_error      |  2 +-
 .../osx/OpenRA.app/Contents/MacOS/download_package   |  2 +-
 3 files changed, 11 insertions(+), 5 deletions(-)

diff --git a/packaging/osx/OpenRA.app/Contents/MacOS/OpenRA b/packaging/osx/OpenRA.app/Contents/MacOS/OpenRA
index 31b675b499..2969512082 100755
--- a/packaging/osx/OpenRA.app/Contents/MacOS/OpenRA
+++ b/packaging/osx/OpenRA.app/Contents/MacOS/OpenRA
@@ -44,7 +44,11 @@ cd $EXE_PATH
 
 # Download and install game dependencies if needed
 if [[ ! -e "mono" ]]; then
-	./download_package "$DEPS_PACKAGE" "$EXE_PATH" "17.2 Mb" "Game Dependencies" $DEPS_URL
+	./download_package "$DEPS_PACKAGE" "$EXE_PATH" "17.2 Mb" "required game dependencies" $DEPS_URL
+	if [[ ! -e "mono" ]]; then
+		./display_error "Installation failed" "Package install failed."
+		exit 1
+	fi
 fi
 
 # Prompt for the mod to run
@@ -68,16 +72,18 @@ fi
 
 # Check that the game data is installed
 if [[ $MOD == "ra" && ! -e "$GAME_PATH/mods/ra/packages/redalert.mix" ]]; then
-	./download_package "ra-packages.zip" "$GAME_PATH/mods/ra/packages/" "10 Mb" "Red Alert" $RA_URL
+	./download_package "ra-packages.zip" "$GAME_PATH/mods/ra/packages/" "10 Mb" "the Red Alert game data" $RA_URL
 	if [[ ! -e "$GAME_PATH/mods/ra/packages/redalert.mix" ]]; then
 		./display_error "Installation failed" "Package install failed."
+		exit 1
 	fi
 fi
 
 if [[ $MOD == "cnc" && ! -e "$GAME_PATH/mods/cnc/packages/conquer.mix" ]]; then
-	./download_package "cnc-packages.zip" "$GAME_PATH/mods/cnc/packages/" "5.9 Mb" "C&C" $CNC_URL
+	./download_package "cnc-packages.zip" "$GAME_PATH/mods/cnc/packages/" "5.9 Mb" "the C&C game data" $CNC_URL
 	if [[ ! -e "$GAME_PATH/mods/cnc/packages/conquer.mix" ]]; then
 		./display_error "Installation failed" "Package install failed."
+		exit 1
 	fi
 fi
 
diff --git a/packaging/osx/OpenRA.app/Contents/MacOS/display_error b/packaging/osx/OpenRA.app/Contents/MacOS/display_error
index af07adbe9e..498c9b135e 100755
--- a/packaging/osx/OpenRA.app/Contents/MacOS/display_error
+++ b/packaging/osx/OpenRA.app/Contents/MacOS/display_error
@@ -27,7 +27,7 @@ RESOURCES_PATH=`pwd`/../Resources
 `/usr/bin/osascript << EOT
 	tell application "Finder" 
 		display dialog "${2}\n\nSupport is available in our irc channel irc.freenode.net #openra." \
-		buttons "Exit" \
+		buttons "Quit" \
 		default button 1 \
 		with title "${1}" \
 		with icon alias (POSIX file "$RESOURCES_PATH/OpenRA.icns")
diff --git a/packaging/osx/OpenRA.app/Contents/MacOS/download_package b/packaging/osx/OpenRA.app/Contents/MacOS/download_package
index ba7c0e31be..dc36c9f7f0 100755
--- a/packaging/osx/OpenRA.app/Contents/MacOS/download_package
+++ b/packaging/osx/OpenRA.app/Contents/MacOS/download_package
@@ -41,7 +41,7 @@ if [ -e "downloads/${1}" ]; then
 else
 CONTINUE=`/usr/bin/osascript << EOT
 	tell application "Finder"
-		display dialog "OpenRA needs to download the ${4} game data.\nDownload size: ${3}" \
+		display dialog "OpenRA needs to download ${4}.\n\nDownload size: ${3}" \
 			buttons {"Download", "Quit"} \
 			default button "Download" \
 			with icon alias (POSIX file "$RESOURCES_PATH/OpenRA.icns")