From 3d4491a4682a779f21232e08255d6fdaede04cc8 Mon Sep 17 00:00:00 2001
From: Paul Betts <paul@paulbetts.org>
Date: Fri, 5 Dec 2014 23:01:03 -0800
Subject: [PATCH] Determine the Helper name from the App name

---
 atom/app/atom_main_delegate_mac.mm | 18 ++++++++++++++----
 1 file changed, 14 insertions(+), 4 deletions(-)

diff --git a/atom/app/atom_main_delegate_mac.mm b/atom/app/atom_main_delegate_mac.mm
index 9795ee459c7..856f510a439 100644
--- a/atom/app/atom_main_delegate_mac.mm
+++ b/atom/app/atom_main_delegate_mac.mm
@@ -19,18 +19,28 @@ base::FilePath GetFrameworksPath() {
                                                .Append("Frameworks");
 }
 
+std::string GetApplicationName() {
+  std::string name = brightray::MainApplicationBundlePath().BaseName().AsUTF8Unsafe();
+  return name.substr(0, name.length() - 4/*.app*/);
+}
+
 }  // namespace
 
 void AtomMainDelegate::OverrideFrameworkBundlePath() {
-  base::mac::SetOverrideFrameworkBundlePath(
-      GetFrameworksPath().Append("Atom Framework.framework"));
+  base::FilePath bundlePath = GetFrameworksPath();
+  std::string app_name = GetApplicationName();
+
+  base::mac::SetOverrideFrameworkBundlePath(bundlePath
+      .Append(app_name + " Framework.framework"));
 }
 
 void AtomMainDelegate::OverrideChildProcessPath() {
-  base::FilePath helper_path = GetFrameworksPath().Append("Atom Helper.app")
+  std::string app_name = GetApplicationName();
+
+  base::FilePath helper_path = GetFrameworksPath().Append(app_name + " Helper.app")
                                                   .Append("Contents")
                                                   .Append("MacOS")
-                                                  .Append("Atom Helper");
+                                                  .Append(app_name + " Helper");
   PathService::Override(content::CHILD_PROCESS_EXE, helper_path);
 }