From fcad068016ebe2c552bab4e7058a265d0a427632 Mon Sep 17 00:00:00 2001
From: Jon Maddox <jon@jonmaddox.com>
Date: Tue, 15 Sep 2015 02:17:01 -0400
Subject: [PATCH] strip the dash

---
 homeassistant/__main__.py                            | 12 ++++++++----
 ....home-assistant.plist => org.homeassistant.plist} |  6 +++---
 2 files changed, 11 insertions(+), 7 deletions(-)
 rename scripts/{org.home-assistant.plist => org.homeassistant.plist} (80%)

diff --git a/homeassistant/__main__.py b/homeassistant/__main__.py
index fb77cd685bb..1736dee9176 100644
--- a/homeassistant/__main__.py
+++ b/homeassistant/__main__.py
@@ -160,20 +160,24 @@ def write_pid(pid_file):
         print('Fatal Error: Unable to write pid file {}'.format(pid_file))
         sys.exit(1)
 
+
 def install_osx():
     app_path = os.popen('pwd').read().strip()
     hass_path = os.popen('which hass').read().strip()
     user = os.popen('whoami').read().strip()
 
-    plist = codecs.open('scripts/org.home-assistant.plist', 'r', 'utf-8')
+    plist = codecs.open('scripts/org.homeassistant.plist', 'r', 'utf-8')
     plist = plist.read()
 
     plist = plist.replace("$APP_PATH$", app_path)
     plist = plist.replace("$HASS_PATH$", hass_path)
     plist = plist.replace("$USER$", user)
 
-    path = os.path.expanduser("~/Library/LaunchAgents/org.home-assistant.plist")
-    os.remove(path)
+    path = os.path.expanduser("~/Library/LaunchAgents/org.homeassistant.plist")
+
+    if os.path.isfile(path):
+        os.remove(path)
+
     plist_file = codecs.open(path, 'w', 'utf-8')
     plist_file.write(plist)
     plist_file.close()
@@ -184,7 +188,7 @@ def install_osx():
 
 
 def uninstall_osx():
-    path = os.path.expanduser("~/Library/LaunchAgents/org.home-assistant.plist")
+    path = os.path.expanduser("~/Library/LaunchAgents/org.homeassistant.plist")
     os.popen('launchctl unload ' + path)
 
     print("Home Assistant has been uninstalled.")
diff --git a/scripts/org.home-assistant.plist b/scripts/org.homeassistant.plist
similarity index 80%
rename from scripts/org.home-assistant.plist
rename to scripts/org.homeassistant.plist
index b4ed5176006..e199b990a72 100644
--- a/scripts/org.home-assistant.plist
+++ b/scripts/org.homeassistant.plist
@@ -3,7 +3,7 @@
 <plist version="1.0">
   <dict>
     <key>Label</key>
-    <string>org.home-assitant</string>
+    <string>org.homeassitant</string>
 
     <key>EnvironmentVariables</key>
     <dict>
@@ -30,10 +30,10 @@
     <string>$APP_PATH$</string>
 
     <key>StandardErrorPath</key>
-    <string>/Users/$USER$/Library/Logs/home-assitant.log</string>
+    <string>/Users/$USER$/Library/Logs/homeassitant.log</string>
 
     <key>StandardOutPath</key>
-    <string>/Users/$USER$/Library/Logs/home-assitant.log</string>
+    <string>/Users/$USER$/Library/Logs/homeassitant.log</string>
 
   </dict>
 </plist>