From f8390864ac8092fa303428e5c877cea3a73d2bee Mon Sep 17 00:00:00 2001
From: pchote <paul@chote.net>
Date: Mon, 22 Feb 2010 03:15:35 +1300
Subject: [PATCH] Tidy packaging script and fix 'Connection Failed' dialog

---
 OpenRa.Game/Chrome.cs    |  2 +-
 packaging/osx/package.sh | 12 ++++++------
 2 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/OpenRa.Game/Chrome.cs b/OpenRa.Game/Chrome.cs
index 739c00d96b..895a7446b7 100644
--- a/OpenRa.Game/Chrome.cs
+++ b/OpenRa.Game/Chrome.cs
@@ -233,7 +233,7 @@ namespace OpenRa
 
 		public void DrawDialog(string text)
 		{
-			var w = renderer.MeasureText(text).X + 120;
+			var w = renderer.MeasureText2(text).X + 120;
 			var h = 100;
 			var r = new Rectangle((Game.viewport.Width - w) / 2, (Game.viewport.Height - h) / 2, w, h);
 			DrawDialogBackground(r, "dialog");
diff --git a/packaging/osx/package.sh b/packaging/osx/package.sh
index d3b434f2ef..8355b256df 100755
--- a/packaging/osx/package.sh
+++ b/packaging/osx/package.sh
@@ -1,8 +1,7 @@
 #!/bin/sh
 # OpenRA Packaging script for osx
 #   Creates a .app bundle for OpenRA game, and a command line app for OpenRa server
-#   Statically links all custom dlls into the executable; only requires Mono
-#   to run on a non-development machine
+#   All dependencies are packaged inside the game bundle
 
 # List of game files to copy into the app bundle
 GAME_FILES="OpenRA shaders mods maps packaging/osx/settings.ini FreeSans.ttf FreeSansBold.ttf"
@@ -22,9 +21,7 @@ function patch_mono {
 		fi
 	done
 	for i in $LIBS; do
-		if [ -e OpenRA.app/Contents/${i:9} ]; then
-			echo "File already processed: "${i:9}
-		else
+		if [ ! -e OpenRA.app/Contents/${i:9} ]; then
 			mkdir -p OpenRA.app/Contents/`dirname ${i:9}`
 			cp $i OpenRA.app/Contents/`dirname ${i:9}`
 			patch_mono OpenRA.app/Contents/${i:9}
@@ -62,4 +59,7 @@ for i in $GAC_DYLIBS; do
 done
 
 cp -R /Library/Frameworks/Cg.Framework OpenRa.app/Contents/Frameworks/
-cp -R /Library/Frameworks/SDL.Framework OpenRa.app/Contents/Frameworks/
\ No newline at end of file
+cp -R /Library/Frameworks/SDL.Framework OpenRa.app/Contents/Frameworks/
+
+# Fix permissions
+chmod -R 755 OpenRA.app
\ No newline at end of file