Merge branch 'master' of dev.sourcefabric.org:airtime

Conflicts:
	install/installInit.php

python_apps/pypo/install/pypo-uninstall.py

@@ -50,6 +50,6 @@ try:
     remove_path("/etc/service/pypo-liquidsoap")
 
     remove_user("pypo")
-    print "Uninstall complete."
+    print "Pypo uninstall complete."
 except Exception, e:
     print "exception:" + str(e)

python_apps/pypo/scripts/ls_lib.liq

@@ -1,6 +1,6 @@
 def notify(m)
-  system("./notify.sh --data='#{!pypo_data}' --media-id=#{m['schedule_table_id']}")
-  print("./notify.sh --data='#{!pypo_data}' --media-id=#{m['schedule_table_id']}")
+  system("/opt/pypo/bin/scripts/notify.sh --data='#{!pypo_data}' --media-id=#{m['schedule_table_id']}")
+  print("/opt/pypo/bin/scripts/notify.sh --data='#{!pypo_data}' --media-id=#{m['schedule_table_id']}")
 end
 
 # A function applied to each metadata chunk

python_apps/pypo/scripts/notify.sh

@@ -4,4 +4,11 @@
 # needed here to keep dirs/configs clean   #
 # and maybe to set user-rights             #
 ############################################
-cd ../ && ./pypo-notify.py $1 $2 $3 $4 $5 $6 $7 $8 &
+pwd
+
+# Absolute path to this script
+SCRIPT=`readlink -f $0`
+# Absolute path this script is in
+SCRIPTPATH=`dirname $SCRIPT`
+
+cd ${SCRIPTPATH}/../ && ./pypo-notify.py $1 $2 $3 $4 $5 $6 $7 $8 &