Merge branch 'master' of dev.sourcefabric.org:airtime
Conflicts: install/installInit.php
This commit is contained in:
commit
c35e78a620
|
@ -50,6 +50,6 @@ try:
|
||||||
remove_path("/etc/service/pypo-liquidsoap")
|
remove_path("/etc/service/pypo-liquidsoap")
|
||||||
|
|
||||||
remove_user("pypo")
|
remove_user("pypo")
|
||||||
print "Uninstall complete."
|
print "Pypo uninstall complete."
|
||||||
except Exception, e:
|
except Exception, e:
|
||||||
print "exception:" + str(e)
|
print "exception:" + str(e)
|
||||||
|
|
|
@ -1,6 +1,6 @@
|
||||||
def notify(m)
|
def notify(m)
|
||||||
system("./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("./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
|
end
|
||||||
|
|
||||||
# A function applied to each metadata chunk
|
# A function applied to each metadata chunk
|
||||||
|
|
|
@ -4,4 +4,11 @@
|
||||||
# needed here to keep dirs/configs clean #
|
# needed here to keep dirs/configs clean #
|
||||||
# and maybe to set user-rights #
|
# 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 &
|
||||||
|
|
Loading…
Reference in New Issue