From cb8c85980260f519bd1dd8a540683a82cb1972f2 Mon Sep 17 00:00:00 2001
From: Cameron Norman <CameronNemo@users.noreply.github.com>
Date: Fri, 7 Mar 2014 16:47:18 -0800
Subject: [PATCH 1/3] Create init.upstart

Created an Upstart job.
---
 init.upstart | 21 +++++++++++++++++++++
 1 file changed, 21 insertions(+)
 create mode 100644 init.upstart

diff --git a/init.upstart b/init.upstart
new file mode 100644
index 00000000..dca883bd
--- /dev/null
+++ b/init.upstart
@@ -0,0 +1,21 @@
+# headphones - Automatic music downloader
+#
+# This is a session/user job. Install this file into /usr/share/upstart/sessions
+# if headphones is installed system wide, and into $XDG_CONFIG_HOME/upstart if
+# headphones is installed per user. Change the executable path appropiately.
+
+start on desktop-session-start
+stop on desktop-shutdown
+
+env CONFIG=""$XDG_CONFIG_HOME"/headphones/headphones.ini"
+env DATA=""$XDG_DATA_HOME"/headphones"
+
+pre-start script
+    [ -d "$XDG_CONFIG_HOME"/headphones ] || mkdir -p "$XDG_CONFIG_HOME"/headphones
+    [ -d "$DATA" ] || mkdir -p "$DATA"
+    [ -f "$CONFIG ] || touch "$CONFIG"
+end script
+
+exec headphones.py --daemon --nolaunch --quiet
+                   --config "$CONFIG"
+                   --datadir "$DATA"

From fbae7c3d30b4b8772f3ea93160de0f183dfd46f7 Mon Sep 17 00:00:00 2001
From: Cameron Norman <CameronNemo@users.noreply.github.com>
Date: Fri, 7 Mar 2014 17:01:19 -0800
Subject: [PATCH 2/3] Update init.upstart

---
 init.upstart | 9 +++------
 1 file changed, 3 insertions(+), 6 deletions(-)

diff --git a/init.upstart b/init.upstart
index dca883bd..0cb3067a 100644
--- a/init.upstart
+++ b/init.upstart
@@ -7,15 +7,12 @@
 start on desktop-session-start
 stop on desktop-shutdown
 
-env CONFIG=""$XDG_CONFIG_HOME"/headphones/headphones.ini"
+env CONFIG=""$XDG_CONFIG_HOME"/headphones"
 env DATA=""$XDG_DATA_HOME"/headphones"
 
 pre-start script
-    [ -d "$XDG_CONFIG_HOME"/headphones ] || mkdir -p "$XDG_CONFIG_HOME"/headphones
+    [ -d "$CONFIG" ] || mkdir -p "$CONFIG"
     [ -d "$DATA" ] || mkdir -p "$DATA"
-    [ -f "$CONFIG ] || touch "$CONFIG"
 end script
 
-exec headphones.py --daemon --nolaunch --quiet
-                   --config "$CONFIG"
-                   --datadir "$DATA"
+exec Headphones.py --nolaunch --config "$CONFIG"/config.ini --datadir "$DATA"

From 6518e61963b2f807715b2b54471c8a17812f2a78 Mon Sep 17 00:00:00 2001
From: Cameron Norman <CameronNemo@users.noreply.github.com>
Date: Fri, 7 Mar 2014 17:26:09 -0800
Subject: [PATCH 3/3] Update init.upstart

---
 init.upstart | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/init.upstart b/init.upstart
index 0cb3067a..79918a89 100644
--- a/init.upstart
+++ b/init.upstart
@@ -4,8 +4,8 @@
 # if headphones is installed system wide, and into $XDG_CONFIG_HOME/upstart if
 # headphones is installed per user. Change the executable path appropiately.
 
-start on desktop-session-start
-stop on desktop-shutdown
+start on desktop-start
+stop on desktop-end
 
 env CONFIG=""$XDG_CONFIG_HOME"/headphones"
 env DATA=""$XDG_DATA_HOME"/headphones"