From 873c5b16a0b33db61acb5348fcb125ab29780bac Mon Sep 17 00:00:00 2001 From: Charlie Fenton Date: Mon, 6 Dec 2010 10:24:59 +0000 Subject: [PATCH] Mac Installer: Fix failure to auto-launch on OS 10.4.x svn path=/trunk/boinc/; revision=22823 --- checkin_notes | 7 +++++++ mac_installer/postinstall | 4 +++- mac_installer/postupgrade | 4 +++- 3 files changed, 13 insertions(+), 2 deletions(-) diff --git a/checkin_notes b/checkin_notes index ff33a629a6..33ebd5eff0 100644 --- a/checkin_notes +++ b/checkin_notes @@ -8624,3 +8624,10 @@ David 2 Dec 2010 clientgui/ */*.xpm + +Charlie 6 Dec 2010 + - Mac Installer: Fix failure to auto-launch on OS 10.4.x. + + mac_installer/ + postinstall + postupgrade diff --git a/mac_installer/postinstall b/mac_installer/postinstall index 8a99ee3fb5..4df8333ede 100644 --- a/mac_installer/postinstall +++ b/mac_installer/postinstall @@ -1,7 +1,7 @@ #!/bin/sh ## -# post-Install Script for Macintosh BOINC Manager for OS X revised 11/22/10 +# post-Install Script for Macintosh BOINC Manager for OS X revised 12/6/10 ## echo "initial directory = $PWD" @@ -21,9 +21,11 @@ fi if [ "${COMMAND_LINE_INSTALL}" = "1" ]; then rm -f /tmp/BOINCInstallLog.txt Contents/Resources/PostInstall.app/Contents/MacOS/PostInstall -part1 >> /tmp/BOINCInstallLog.txt +sleep 2 Contents/Resources/PostInstall.app/Contents/MacOS/PostInstall -part2 & >> /tmp/BOINCInstallLog.txt else Contents/Resources/PostInstall.app/Contents/MacOS/PostInstall -part1 +sleep 2 Contents/Resources/PostInstall.app/Contents/MacOS/PostInstall -part2 & fi diff --git a/mac_installer/postupgrade b/mac_installer/postupgrade index 583577652b..02dd0d61c2 100755 --- a/mac_installer/postupgrade +++ b/mac_installer/postupgrade @@ -1,7 +1,7 @@ #!/bin/sh ## -# post-Upgrade Script for Macintosh BOINC Manager for OS X revised 11/22/10 +# post-Upgrade Script for Macintosh BOINC Manager for OS X revised 12/6/10 ## echo "initial directory = $PWD" @@ -21,9 +21,11 @@ fi if [ "${COMMAND_LINE_INSTALL}" = "1" ]; then rm -f /tmp/BOINCInstallLog.txt Contents/Resources/PostInstall.app/Contents/MacOS/PostInstall -part1 >> /tmp/BOINCInstallLog.txt +sleep 2 Contents/Resources/PostInstall.app/Contents/MacOS/PostInstall -part2 & >> /tmp/BOINCInstallLog.txt else Contents/Resources/PostInstall.app/Contents/MacOS/PostInstall -part1 +sleep 2 Contents/Resources/PostInstall.app/Contents/MacOS/PostInstall -part2 & fi