From c62887f279a3f848fcfcf18607bf0493f2e6f32f Mon Sep 17 00:00:00 2001
From: Ben Gotow <ben@foundry376.com>
Date: Sat, 12 Aug 2017 18:41:59 -0700
Subject: [PATCH] Lowercase the MailSync process name on Mac OS X for
 consistency

---
 .gitignore                      | 2 +-
 .travis.yml                     | 2 +-
 app/build/tasks/package-task.js | 4 ++--
 app/src/mailsync-process.es6    | 2 +-
 mailsync                        | 2 +-
 5 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/.gitignore b/.gitignore
index 43f713885..5e0c7f936 100644
--- a/.gitignore
+++ b/.gitignore
@@ -63,6 +63,6 @@ scripts/venv
 
 # OAuth client secret for talking to Google Sheets
 client_secret.json
-/app/MailSync
+/app/mailsync
 /logfile.txt
 /app/dist-docs
diff --git a/.travis.yml b/.travis.yml
index 4ebd1b66a..2b2435c10 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -14,7 +14,7 @@ addons:
     target_paths: client/${TRAVIS_COMMIT:0:8}/${TRAVIS_OS_NAME}
     permissions: public-read
     paths:
-    - ../MailSync
+    - ../mailsync
     - Merani.dmg
     - Merani.zip
     - $(find . -type f -name *.deb | tr "\n" ":")
diff --git a/app/build/tasks/package-task.js b/app/build/tasks/package-task.js
index 7f5d51976..d4953483f 100644
--- a/app/build/tasks/package-task.js
+++ b/app/build/tasks/package-task.js
@@ -147,8 +147,8 @@ module.exports = (grunt) => {
       'derefSymlinks': false,
       'asar': {
         'unpack': "{" + [
-          'MailSync',
-          'MailSync.exe',
+          'mailsync',
+          'mailsync.exe',
           '*.node',
           '**/vendor/**',
           'examples/**',
diff --git a/app/src/mailsync-process.es6 b/app/src/mailsync-process.es6
index aaa0aaf98..83400f322 100644
--- a/app/src/mailsync-process.es6
+++ b/app/src/mailsync-process.es6
@@ -38,7 +38,7 @@ export default class MailsyncProcess extends EventEmitter {
     this.configDirPath = configDirPath;
     this.account = account;
     this.identity = identity;
-    this.binaryPath = path.join(resourcePath, 'MailSync').replace('app.asar', 'app.asar.unpacked');
+    this.binaryPath = path.join(resourcePath, 'mailsync').replace('app.asar', 'app.asar.unpacked');
     this._proc = null;
   }
 
diff --git a/mailsync b/mailsync
index 2f2e2dd60..1af7f5408 160000
--- a/mailsync
+++ b/mailsync
@@ -1 +1 @@
-Subproject commit 2f2e2dd600191449aab3924c9988c814b8ff8303
+Subproject commit 1af7f54080fdcb399f042fc0426f1f60df639fdd