From 7da9bdc7ec1af28c56480179a945f3c601aae4f4 Mon Sep 17 00:00:00 2001
From: Charlie Fenton <charlief@example.com>
Date: Thu, 18 Sep 2008 09:23:11 +0000
Subject: [PATCH] make_GridRepublic.sh script copy acct_mgr_url.xml file to
 BOINC Data directory

svn path=/trunk/boinc/; revision=16016
---
 checkin_notes                      | 11 ++++++++++-
 mac_installer/make_GridRepublic.sh |  8 +++++++-
 2 files changed, 17 insertions(+), 2 deletions(-)

diff --git a/checkin_notes b/checkin_notes
index 99217f2e20..1013476ebd 100644
--- a/checkin_notes
+++ b/checkin_notes
@@ -7503,7 +7503,8 @@ David  17 Sept 2008
 		sched_config.C
 
 Charlie 17 Sep 2008
-    lib: - Remove incorrect "#ifdef _WIN32" blocks added 9/10/08 to filesys.C.
+    lib: - Remove incorrect "#ifdef _WIN32" blocks added 9/10/08 to 
+        filesys.C.
 
     lib/
         filesys.C
@@ -7525,3 +7526,11 @@ David  17 Sept 2008
         sched_config.C,h
         sched_send.C
         validate_util2.C
+
+Charlie 18 Sep 2008
+    Mac branding: make_GridRepublic.sh script copy acct_mgr_url.xml file 
+        to BOINC Data directory so BOINC will connect to GridRepublic 
+        account manager automatically.
+     
+    mac_installer/
+        make_GridRepublic.sh
diff --git a/mac_installer/make_GridRepublic.sh b/mac_installer/make_GridRepublic.sh
index 8e76cd9301..e69088fa7c 100644
--- a/mac_installer/make_GridRepublic.sh
+++ b/mac_installer/make_GridRepublic.sh
@@ -21,7 +21,7 @@
 
 ##
 # Script to convert Macintosh BOINC installer to GridRepublic Desktop installer
-# updated 9/3/08 by Charlie Fenton
+# updated 9/18/08 by Charlie Fenton
 ##
 
 ## Usage:
@@ -38,6 +38,7 @@
 ##     gridrepublic.tiff (for screensaver)
 ##     gridrepublic_ss_logo (for screensaver)
 ##     skins directory containing GridRepublic skin (optional)
+##     acct_mgr_url.xml (to have BOINC automatically connect to Account Manager)
 ##
 ## NOTE: This script uses PackageMaker, which is installed as part of the 
 ##   XCode developer tools.  So you must have installed XCode Developer 
@@ -153,6 +154,11 @@ if [ -d "skins" ]; then
     sudo cp -fR "skins" "${PR_PATH}/Library/Application Support/BOINC Data/"
 fi
 
+## If account manager URL file is present, copy it into BOINC Data folder
+if [ -f "acct_mgr_url.xml" ]; then
+    sudo cp -fR "acct_mgr_url.xml" "${PR_PATH}/Library/Application Support/BOINC Data/acct_mgr_url.xml"
+fi
+
 ## Modify for Grid Republic
 # Rename the Manager's bundle and its executable inside the bundle
 sudo mv -f "${PR_PATH}/Applications/BOINCManager.app/" "${PR_PATH}/Applications/${MANAGER_NAME}.app/"