From f96246ae3f1cbfca34503586cce2fa38597c0a65 Mon Sep 17 00:00:00 2001
From: Kevin Reed <knreed@us.ibm.com>
Date: Tue, 14 Nov 2017 20:33:20 -0600
Subject: [PATCH] Client - Change constant INSTALLER_FILENAME_FILENAME TO
 ACCOUNT_DATA_FILENAME for mac installer

---
 mac_installer/Installer.cpp   | 8 ++++----
 mac_installer/PostInstall.cpp | 2 +-
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/mac_installer/Installer.cpp b/mac_installer/Installer.cpp
index 061c3adea5..eafa15c067 100644
--- a/mac_installer/Installer.cpp
+++ b/mac_installer/Installer.cpp
@@ -124,24 +124,24 @@ int main(int argc, char *argv[])
     }
     
     // Delete any old project auto-attach key file from our temp directory
-    snprintf(temp2, sizeof(temp2), "rm -dfR \"/tmp/%s/%s\"", tempDirName, INSTALLER_FILENAME_FILENAME);
+    snprintf(temp2, sizeof(temp2), "rm -dfR \"/tmp/%s/%s\"", tempDirName, ACCOUNT_DATA_FILENAME);
     err = callPosixSpawn(temp2);
     REPORT_ERROR(err);
 
     // Write a file containing the project auto-attach key into our temp
     // directory because the BOINC Data directory may not yet exist.
     // PostInstall.app will copy it into the BOINC Data directory laer
-    snprintf(temp2, sizeof(temp2), "%s/%s", temp, INSTALLER_FILENAME_FILENAME);
+    snprintf(temp2, sizeof(temp2), "%s/%s", temp, );CCOUNT_DATA_FILENAME
     if (boinc_file_exists(temp2)) {
         // If the project server put installer_filename.txt file in the same
         // parent directory as this installer, copy it into our temp directory
-        snprintf(temp2, sizeof(temp2), "cp \"%s/%s\" \"/tmp/%s/%s\"", temp, INSTALLER_FILENAME_FILENAME, tempDirName, INSTALLER_FILENAME_FILENAME);
+        snprintf(temp2, sizeof(temp2), "cp \"%s/%s\" \"/tmp/%s/%s\"", temp, ACCOUNT_DATA_FILENAME, tempDirName, ACCOUNT_DATA_FILENAME);
         err = callPosixSpawn(temp2);
         REPORT_ERROR(err);
     } else {
         // Create an installer_filename.txt file containing our 
         // installer's filename and put it in our temp directory
-        snprintf(temp2, sizeof(temp2), "/tmp/%s/%s", tempDirName, INSTALLER_FILENAME_FILENAME);
+        snprintf(temp2, sizeof(temp2), "/tmp/%s/%s", tempDirName, ACCOUNT_DATA_FILENAME);
         FILE* f = fopen(temp2, "w");
         fputs(p+1, f);
         fclose(f);
diff --git a/mac_installer/PostInstall.cpp b/mac_installer/PostInstall.cpp
index 6f5eeb0b86..5cf7a1cb3c 100644
--- a/mac_installer/PostInstall.cpp
+++ b/mac_installer/PostInstall.cpp
@@ -344,7 +344,7 @@ int main(int argc, char *argv[])
     
     // copy temp file contining installer filename into the BOINC Data directory
     snprintf(s, sizeof(s), "mv -f \"/tmp/%s/%s\" \"/Library/Application Support/BOINC Data/\"",
-        tempDirName, INSTALLER_FILENAME_FILENAME);
+        tempDirName, ACCOUNT_DATA_FILENAME);
     err = callPosixSpawn (s);
     REPORT_ERROR(err);