Rooba
/
boinc
mirror of https://github.com/BOINC/boinc.git
1
0
Fork 0
Code Issues 1 Packages Projects Releases Wiki Activity

Mac installer: fix bugs introduced in my commits bbc1c40 when replacing deprecated system() calls with posix_spawnp() calls

This commit is contained in:
Charlie Fenton 2017-06-04 06:05:58 -07:00
parent 46b5bf988b
commit e2ed684459
2 changed files with 47 additions and 53 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
mac_installer/Installer.cpp
View File

@ -17,7 +17,8 @@
/* Installer.cpp */
#define CREATE_LOG 1 /* for debugging */
#define CREATE_LOG 0 /* for debugging */
#define VERBOSE_TEST 0
#include <Carbon/Carbon.h>
#include <grp.h>
@ -77,11 +78,10 @@ int main(int argc, char *argv[])
OSStatus err = noErr;
Boolean restartNeeded = true;
FILE *restartNeededFile;
if (Initialize() != noErr) {
return 0;
}
// Get the full path to Installer package inside this application's bundle
getPathToThisApp(pkgPath, sizeof(pkgPath));
strlcpy(temp, pkgPath, sizeof(temp));
@ -154,9 +154,10 @@ int main(int argc, char *argv[])
if (restartNeeded) {
if (err == noErr) {
// Change onConclusion="none" to onConclusion="RequireRestart"
err = callPosixSpawn("sed -i \"\" s/\"onConclusion=\\\"none\\\"\"/\"onConclusion=\\\"RequireRestart\\\"\"/g /tmp/expanded_BOINC.pkg/Distribution");
err = callPosixSpawn("sed -i \".bak\" s/onConclusion=\"none\"/onConclusion=\"RequireRestart\"/g /tmp/expanded_BOINC.pkg/Distribution");
}
if (err == noErr) {
callPosixSpawn("rm -dfR /tmp/expanded_BOINC.pkg/Distribution.bak");
// Flatten the installer package
sprintf(temp, "pkgutil --flatten /tmp/expanded_BOINC.pkg /tmp/%s.pkg", brand);
err = callPosixSpawn(temp);
@ -165,7 +166,7 @@ int main(int argc, char *argv[])
}
if (err == noErr) {
sprintf(temp, "open \"/tmp/%s.pkg\" &", brand);
sprintf(temp, "open \"/tmp/%s.pkg\"", brand);
callPosixSpawn(temp);
return 0;
}
@ -173,7 +174,7 @@ int main(int argc, char *argv[])
callPosixSpawn("rm -fR /tmp/expanded_BOINC.pkg");
sprintf(temp, "open \"%s\" &", pkgPath);
sprintf(temp, "open \"%s\"", pkgPath);
callPosixSpawn(temp);
return err;
@ -209,7 +210,7 @@ Boolean IsRestartNeeded()
gid_t boinc_master_gid = 0, boinc_project_gid = 0;
uid_t boinc_master_uid = 0, boinc_project_uid = 0;
char loginName[256];
if (compareOSVersionTo(10, 9) >= 0) {
return false;
}
@ -299,8 +300,9 @@ static void GetPreferredLanguages() {
getcwd(savedWD, sizeof(savedWD));
callPosixSpawn("rm -dfR /tmp/BOINC_payload");
mkdir("/tmp/BOINC_payload", 0777);
chmod("/tmp/BOINC_payload", 0777); // Why doesn't mkdir set permissions correctly?
chdir("/tmp/BOINC_payload");
callPosixSpawn("cpio -i < /tmp/expanded_BOINC.pkg/BOINC.pkg/Payload");
callPosixSpawn("cpio -i -I /tmp/expanded_BOINC.pkg/BOINC.pkg/Payload");
chdir(savedWD);
// Create an array of all our supported languages
@ -350,7 +352,8 @@ static void GetPreferredLanguages() {
// Write a temp file to tell our PostInstall.app our preferred languages
f = fopen("/tmp/BOINC_preferred_languages", "w");
print_to_log_file("Create BOINC_preferred_languages %s", f ? "OK" : "failed");
for (i=0; i<MAX_LANGUAGES_TO_TRY; ++i) {
preferredLanguages = CFBundleCopyLocalizationsForPreferences(supportedLanguages, NULL );
@ -374,9 +377,9 @@ static void GetPreferredLanguages() {
}
if (f && language) {
fprintf(f, "%s\n", language);
print_to_log_file("Adding language: %s\n", language);
}
// Remove all copies of this language from our list of supported languages
// Remove all copies of this language from our list of supported languages
// so we can get the next preferred language in order of priority
for (k=CFArrayGetCount(supportedLanguages)-1; k>=0; --k) {
if (CFStringCompare(aLanguage, (CFStringRef)CFArrayGetValueAtIndex(supportedLanguages, k), 0) == kCFCompareEqualTo) {
@ -410,6 +413,7 @@ cleanup:
CFArrayRemoveAllValues(supportedLanguages);
CFRelease(supportedLanguages);
supportedLanguages = NULL;
print_to_log_file("Exiting GetPreferredLanguages");
}
@ -549,8 +553,8 @@ int callPosixSpawn(const char *cmdline) {
int result = 0;
int status = 0;
extern char **environ;
// Make a copy of cmdline because parse_posic_spawn_command_line modifies it
// Make a copy of cmdline because parse_posix_spawn_command_line modifies it
strlcpy(command, cmdline, sizeof(command));
argc = parse_posic_spawn_command_line(const_cast<char*>(command), argv);
strlcpy(progPath, argv[0], sizeof(progPath));
@ -617,7 +621,7 @@ void print_to_log_file(const char *format, ...) {
char buf[256];
time_t t;
strlcpy(buf, getenv("HOME"), sizeof(buf));
strlcpy(buf, "/Documents/test_log.txt", sizeof(buf));
strlcat(buf, "/Documents/test_log.txt", sizeof(buf));
f = fopen(buf, "a");
if (!f) return;

68
mac_installer/PostInstall.cpp
View File

@ -155,12 +155,10 @@ static char loginName[256];
static time_t waitPermissionsStartTime;
static char *saverName[NUMBRANDS];
static char *saverNameEscaped[NUMBRANDS];
static char *brandName[NUMBRANDS];
static char *appName[NUMBRANDS];
static char *appPath[NUMBRANDS];
static char *appPathEscaped[NUMBRANDS];
static char *receiptNameEscaped[NUMBRANDS];
static char *receiptName[NUMBRANDS];
static char *skinName[NUMBRANDS];
enum { launchWhenDone,
@ -194,38 +192,30 @@ int main(int argc, char *argv[])
appName[0] = "BOINCManager";
appPath[0] = "/Applications/BOINCManager.app";
appPathEscaped[0] = "/Applications/BOINCManager.app";
brandName[0] = "BOINC";
saverName[0] = "BOINCSaver";
saverNameEscaped[0] = "BOINCSaver";
receiptNameEscaped[0] = "/Library/Receipts/BOINC\\ Installer.pkg";
receiptName[0] = "/Library/Receipts/BOINC Installer.pkg";
skinName[0] = "Default";
appName[1] = "GridRepublic Desktop";
appPath[1] = "/Applications/GridRepublic Desktop.app";
appPathEscaped[1] = "/Applications/GridRepublic\\ Desktop.app";
brandName[1] = "GridRepublic";
saverName[1] = "GridRepublic";
saverNameEscaped[1] = "GridRepublic";
receiptNameEscaped[1] = "/Library/Receipts/GridRepublic\\ Installer.pkg";
receiptName[1] = "/Library/Receipts/GridRepublic Installer.pkg";
skinName[1] = "GridRepublic";
appName[2] = "Progress Thru Processors Desktop";
appPath[2] = "/Applications/Progress Thru Processors Desktop.app";
appPathEscaped[2] = "/Applications/Progress\\ Thru\\ Processors\\ Desktop.app";
brandName[2] = "Progress Thru Processors";
saverName[2] = "Progress Thru Processors";
saverNameEscaped[2] = "Progress\\ Thru\\ Processors";
receiptNameEscaped[2] = "/Library/Receipts/Progress\\ Thru\\ Processors\\ Installer.pkg";
receiptName[2] = "/Library/Receipts/Progress Thru Processors Installer.pkg";
skinName[2] = "ProgressThruProcessors";
appName[3] = "Charity Engine Desktop";
appPath[3] = "/Applications/Charity Engine Desktop.app";
appPathEscaped[3] = "/Applications/Charity\\ Engine\\ Desktop.app";
brandName[3] = "Charity Engine";
saverName[3] = "Charity Engine";
saverNameEscaped[3] = "Charity\\ Engine";
receiptNameEscaped[3] = "/Library/Receipts/Charity\\ Engine\\ Installer.pkg";
receiptName[3] = "/Library/Receipts/Charity Engine Installer.pkg";
skinName[3] = "Charity Engine";
puts("Starting PostInstall app\n");
@ -278,20 +268,20 @@ int main(int argc, char *argv[])
s[0] = sprintf(s+1, "Sorry, this version of %s requires system 10.6 or higher.", brandName[brandID]);
StandardAlert (kAlertStopAlert, (StringPtr)s, NULL, NULL, &itemHit);
// "rm -rf /Applications/GridRepublic\\ Desktop.app"
sprintf(s, "rm -rf %s", appPathEscaped[brandID]);
// "rm -rf \"/Applications/GridRepublic Desktop.app\""
sprintf(s, "rm -rf \"%s\"", appPath[brandID]);
callPosixSpawn (s);
// "rm -rf /Library/Screen\\ Savers/GridRepublic.saver"
sprintf(s, "rm -rf /Library/Screen\\ Savers/%s.saver", saverNameEscaped[brandID]);
// "rm -rf \"/Library/Screen Savers/GridRepublic.saver\""
sprintf(s, "rm -rf \"/Library/Screen Savers/%s.saver\"", saverName[brandID]);
callPosixSpawn (s);
// "rm -rf /Library/Receipts/GridRepublic.pkg"
sprintf(s, "rm -rf %s", receiptNameEscaped[brandID]);
sprintf(s, "rm -rf \"%s\"", receiptName[brandID]);
callPosixSpawn (s);
// We don't customize BOINC Data directory name for branding
callPosixSpawn ("rm -rf /Library/Application\\ Support/BOINC\\ Data");
callPosixSpawn ("rm -rf \"/Library/Application Support/BOINC Data\"");
err = kill(installerPID, SIGKILL);
@ -383,22 +373,22 @@ int main(int argc, char *argv[])
}
// Set owner of branded BOINCManager and contents, including core client
// "chown -Rf username /Applications/GridRepublic\\ Desktop.app"
sprintf(s, "chown -Rf %s %s", p, appPathEscaped[brandID]);
// "chown -Rf username \"/Applications/GridRepublic Desktop.app\""
sprintf(s, "chown -Rf %s \"%s\"", p, appPath[brandID]);
callPosixSpawn (s);
// Set owner of BOINC Screen Saver
// "chown -Rf username /Library/Screen\\ Savers/GridRepublic.saver"
sprintf(s, "chown -Rf %s /Library/Screen\\ Savers/%s.saver", p, saverNameEscaped[brandID]);
// "chown -Rf username \"/Library/Screen Savers/GridRepublic.saver\""
sprintf(s, "chown -Rf %s \"/Library/Screen Savers/%s.saver\"", p, saverName[brandID]);
callPosixSpawn (s);
// We don't customize BOINC Data directory name for branding
// "chown -Rf username /Library/Application\\ Support/BOINC\\ Data"
sprintf(s, "chown -Rf %s /Library/Application\\ Support/BOINC\\ Data", p);
// "chown -Rf username \"/Library/Application Support/BOINC Data\""
sprintf(s, "chown -Rf %s \"/Library/Application Support/BOINC Data\"", p);
callPosixSpawn (s);
// "chmod -R a+s /Applications/GridRepublic\\ Desktop.app"
sprintf(s, "chmod -R a+s %s", appPathEscaped[brandID]);
// "chmod -R a+s \"/Applications/GridRepublic Desktop.app\""
sprintf(s, "chmod -R a+s \"%s\"", appPath[brandID]);
callPosixSpawn (s);
#endif // ! defined(SANDBOX)
@ -407,17 +397,17 @@ int main(int argc, char *argv[])
for (i=0; i< NUMBRANDS; i++) {
if (i == brandID) continue;
// "rm -rf /Applications/GridRepublic\\ Desktop.app"
sprintf(s, "rm -rf %s", appPathEscaped[i]);
// "rm -rf \"/Applications/GridRepublic Desktop.app\""
sprintf(s, "rm -rf \"%s\"", appPath[i]);
callPosixSpawn (s);
// "rm -rf /Library/Screen\\ Savers/GridRepublic.saver"
sprintf(s, "rm -rf /Library/Screen\\ Savers/%s.saver", saverNameEscaped[i]);
// "rm -rf \"/Library/Screen Savers/GridRepublic.saver\""
sprintf(s, "rm -rf \"/Library/Screen Savers/%s.saver\"", saverName[i]);
callPosixSpawn (s);
}
if (brandID == 0) { // Installing generic BOINC
callPosixSpawn ("rm -f /Library/Application\\ Support/BOINC\\ Data/Branding");
callPosixSpawn ("rm -f \"/Library/Application Support/BOINC Data/Branding\"");
}
CFStringRef CFAppPath = CFStringCreateWithCString(kCFAllocatorDefault, appPath[brandID],
@ -571,7 +561,7 @@ int DeleteReceipt()
// Remove installer package receipt so we can run installer again if needed to fix permissions
// "rm -rf /Library/Receipts/GridRepublic.pkg"
sprintf(s, "rm -rf %s", receiptNameEscaped[brandID]);
sprintf(s, "rm -rf \"%s\"", receiptName[brandID]);
callPosixSpawn (s);
if (!restartNeeded) {
@ -821,7 +811,7 @@ Boolean SetLoginItemOSAScript(long brandID, Boolean deleteLogInItem, char *userN
#if CREATE_LOG
if (err == noErr) {
print_to_log_file(stdout, "SystemEvents is at %s\n", systemEventsPath);
print_to_log_file("SystemEvents is at %s\n", systemEventsPath);
} else {
print_to_log_file("GetPathToAppFromID(kSystemEventsCreator, kSystemEventsBundleID) returned error %d ", (int) err);
}
@ -1549,10 +1539,10 @@ OSErr UpdateAllVisibleUsers(long brandID)
if (setSaverForAllUsers) {
if (compareOSVersionTo(10, 6) < 0) {
sprintf(s, "sudo -u \"%s\" defaults -currentHost write com.apple.screensaver moduleName %s", pw->pw_name, saverNameEscaped[brandID]);
sprintf(s, "sudo -u \"%s\" defaults -currentHost write com.apple.screensaver moduleName \"%s\"", pw->pw_name, saverName[brandID]);
callPosixSpawn (s);
sprintf(s, "sudo -u \"%s\" defaults -currentHost write com.apple.screensaver modulePath /Library/Screen\\ Savers/%s.saver",
pw->pw_name, saverNameEscaped[brandID]);
sprintf(s, "sudo -u \"%s\" defaults -currentHost write com.apple.screensaver modulePath \"/Library/Screen Savers/%s.saver\"",
pw->pw_name, saverName[brandID]);
callPosixSpawn (s);
} else {
seteuid(pw->pw_uid); // Temporarily set effective uid to this user