Merge branch 'cc-2015-on-reboot-resume-show' into devel

Conflicts:
	python_apps/media-monitor/airtime-media-monitor-init-d

python_apps/media-monitor/airtime-media-monitor-init-d

@@ -11,17 +11,19 @@
 
 USERID=root
 GROUPID=www-data
-NAME=Airtime
+NAME=Airtime\ Media\ Monitor
 
-DAEMON=/usr/bin/airtime-media-monitor
+DAEMON=/usr/lib/airtime/media-monitor/airtime-media-monitor
 PIDFILE=/var/run/airtime-media-monitor.pid
 
 start () {
+        monit monitor airtime-media-monitor
         start-stop-daemon --start --background --quiet --chuid $USERID:$GROUPID --make-pidfile --pidfile $PIDFILE --startas $DAEMON
 }
 
 stop () {
         # Send TERM after 5 seconds, wait at most 30 seconds.
+        monit unmonitor airtime-media-monitor
         start-stop-daemon --stop --oknodo --retry TERM/5/0/30 --quiet --pidfile $PIDFILE
         rm -f $PIDFILE
 }

python_apps/media-monitor/install/media-monitor-install.py

@@ -66,10 +66,6 @@ try:
   #os.system("chmod -R 755 "+config["bin_dir"]+"/airtime-media-monitor)
   os.system("chown -R pypo:pypo "+config["bin_dir"])
 
-  print "Creating symbolic links"
-  os.system("rm -f /usr/bin/airtime-media-monitor")
-  os.system("ln -s "+config["bin_dir"]+"/airtime-media-monitor /usr/bin/")
-
   print "Installing media-monitor daemon"
   shutil.copy(config["bin_dir"]+"/airtime-media-monitor-init-d", "/etc/init.d/airtime-media-monitor")
 

python_apps/media-monitor/install/media-monitor-uninstall.py

@@ -12,7 +12,7 @@ if os.geteuid() != 0:
 PATH_INI_FILE = '/etc/airtime/media-monitor.cfg'
 
 def remove_path(path):
-    os.system("rm -rf " + path)
+    os.system('rm -rf "%s"' % path)
 
 def get_current_script_dir():
   current_script_dir = os.path.realpath(__file__)