From d709e6ff2069878b32687efcee2c02ffedfeb586 Mon Sep 17 00:00:00 2001 From: Charlie Fenton Date: Tue, 11 Jun 2013 05:40:44 -0700 Subject: [PATCH] Mac installer: To avoid invalidating our code signing: use a metapackage instead of modifying the property list file to trigger a system restart when needed. --- mac_installer/Installer.cpp | 2 +- mac_installer/release_boinc.sh | 9 +++++---- 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/mac_installer/Installer.cpp b/mac_installer/Installer.cpp index d8770cc279..644f31baa9 100644 --- a/mac_installer/Installer.cpp +++ b/mac_installer/Installer.cpp @@ -107,7 +107,7 @@ int main(int argc, char *argv[]) strlcat(MetaPkgPath, "+VirtualBox.mpkg", sizeof(MetaPkgPath)); strlcpy(MetaPkgRestartPath, pkgPath, sizeof(MetaPkgRestartPath)); - strlcat(MetaPkgRestartPath, "+VirtualBox .mpkg", sizeof(MetaPkgRestartPath)); + strlcat(MetaPkgRestartPath, " + VirtualBox.mpkg", sizeof(MetaPkgRestartPath)); strlcpy(pkgRestartPath, pkgPath, sizeof(MetaPkgPath)); strlcat(pkgRestartPath, ".mpkg", sizeof(pkgPath)); diff --git a/mac_installer/release_boinc.sh b/mac_installer/release_boinc.sh index 841cde8d7e..0b153c5872 100644 --- a/mac_installer/release_boinc.sh +++ b/mac_installer/release_boinc.sh @@ -304,11 +304,12 @@ ENDOFFILE cp -fpR mac_installer/${VirtualBoxPackageName} ../BOINC_Installer/New_Release_$1_$2_$3/boinc_$1.$2.$3_macOSX_$arch/BOINC\ Installer.app/Contents/Resources/ - # Now create the "BOINC+VirtualBox .mpkg" metapackage (used if installer.app + # Now create the "BOINC + VirtualBox.mpkg" metapackage (used if installer.app # determines that we need user to restart OS X after installation) - cp -fpR "../BOINC_Installer/New_Release_$1_$2_$3/boinc_$1.$2.$3_macOSX_$arch/BOINC Installer.app/Contents/Resources/BOINC+VirtualBox.mpkg" "../BOINC_Installer/New_Release_$1_$2_$3/boinc_$1.$2.$3_macOSX_$arch/BOINC Installer.app/Contents/Resources/BOINC+VirtualBox .mpkg" - # Change "NoRestart" to "RequiredRestart" in BOINC+VirtualBox .mpkg - sed -i "" s/"NoRestart"/"RequiredRestart"/g "../BOINC_Installer/New_Release_$1_$2_$3/boinc_$1.$2.$3_macOSX_$arch/BOINC Installer.app/Contents/Resources/BOINC+VirtualBox .mpkg/Contents/Info.plist" + # Note the name of this version has spaces around the "+" + cp -fpR "../BOINC_Installer/New_Release_$1_$2_$3/boinc_$1.$2.$3_macOSX_$arch/BOINC Installer.app/Contents/Resources/BOINC+VirtualBox.mpkg" "../BOINC_Installer/New_Release_$1_$2_$3/boinc_$1.$2.$3_macOSX_$arch/BOINC Installer.app/Contents/Resources/BOINC + VirtualBox.mpkg" + # Change "NoRestart" to "RequiredRestart" in BOINC + VirtualBox.mpkg + sed -i "" s/"NoRestart"/"RequiredRestart"/g "../BOINC_Installer/New_Release_$1_$2_$3/boinc_$1.$2.$3_macOSX_$arch/BOINC Installer.app/Contents/Resources/BOINC + VirtualBox.mpkg/Contents/Info.plist" fi # Build the stand-alone client distribution