From f0487e88f420f52ecbfd822495c2d4a8ce337635 Mon Sep 17 00:00:00 2001 From: Charlie Fenton Date: Mon, 29 Sep 2014 05:14:15 -0700 Subject: [PATCH] Mac installer: fix a bug which prevented localizing BOINC installer dialogs. --- mac_installer/Installer.cpp | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/mac_installer/Installer.cpp b/mac_installer/Installer.cpp index 9d5477b1e8..319a56c33b 100644 --- a/mac_installer/Installer.cpp +++ b/mac_installer/Installer.cpp @@ -109,11 +109,11 @@ int main(int argc, char *argv[]) // Expand the installer package system("rm -dfR /tmp/BOINC.pkg"); system("rm -dfR /tmp/expanded_BOINC.pkg"); - - if (compareOSVersionTo(10, 9) < 0) { - sprintf(temp, "pkgutil --expand \"%s\" /tmp/expanded_BOINC.pkg", pkgPath); - err = system(temp); - } + system("rm -f /tmp/BOINC_preferred_languages"); + system("rm -f /tmp/BOINC_restart_flag"); + + sprintf(temp, "pkgutil --expand \"%s\" /tmp/expanded_BOINC.pkg", pkgPath); + err = system(temp); if (err == noErr) { GetPreferredLanguages(); @@ -167,6 +167,8 @@ int main(int argc, char *argv[]) } } + system("rm -fR /tmp/expanded_BOINC.pkg"); + sprintf(temp, "open \"%s\" &", pkgPath); system(temp);