Merge lp:~isoschiz/endroid/fixexeccmd into lp:endroid

[Martin Morrison]

Fixes the exec command, which previously was confusing upstart.

Fixes the exec command, which previously was confusing upstart.

[Phil Connell (pconnell)]

As we discussed, I think this needs a comment given that I didn't guess correctly why the change was needed :)

review: Needs Fixing

[lp:~isoschiz/endroid/fixexeccmd]

54. By Martin Morrison on 2013-08-22

Add a comment

[Phil Connell (pconnell)]

review: Approve

=== modified file 'bin/endroid'
--- bin/endroid	2013-08-12 11:32:00 +0000
+++ bin/endroid	2013-08-22 11:49:46 +0000
@@ -1,2 +1,5 @@
 #!/bin/sh
-PYTHONPATH="~/.endroid/plugins/":"/usr/lib/endroid/dependencies/wokkel-0.7.1-py2.7.egg":"/usr/lib/endroid/plugins":"${PYTHONPATH}" python -m endroid $@
+# Use exec here to ensure that upstart (or other init daemon) can easily follow
+# the true daemon process.
+export PYTHONPATH="~/.endroid/plugins/":"/usr/lib/endroid/dependencies/wokkel-0.7.1-py2.7.egg":"/usr/lib/endroid/plugins":"${PYTHONPATH}"
+exec python -m endroid $@