Congegni/sintonia
7
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

CC-2016: Rearrange python scripts for reusability

Browse source 
-fixed path issue that was happening on some systems
This commit is contained in:
martin 2011-03-24 14:01:16 -04:00
parent c254422f72
commit 17181674b7
5 changed files with 14 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

2
install/airtime-uninstall.php
View file

@ -82,7 +82,7 @@ if ($results == 0) {
AirtimeInstall::DeleteFilesRecursive($CC_CONFIG['storageDir']); AirtimeInstall::DeleteFilesRecursive($CC_CONFIG['storageDir']);
$command = "python ".__DIR__."/../pypo/install/pypo-uninstall.py"; $command = "python ".__DIR__."/../python_apps/pypo/install/pypo-uninstall.py";
system($command); system($command);
$command = "python ".__DIR__."/../python_apps/show-recorder/install/recorder-uninstall.py"; $command = "python ".__DIR__."/../python_apps/show-recorder/install/recorder-uninstall.py";

4
install/installInit.php
View file

@ -214,8 +214,8 @@ class AirtimeInstall {
} }
public static function RemoveSymlinks(){ public static function RemoveSymlinks(){
exec("rm /usr/bin/airtime-import"); exec("rm /usr/bin/airtime-import >/dev/null 2>&1");
exec("rm /usr/bin/airtime-clean-storage"); exec("rm /usr/bin/airtime-clean-storage >/dev/null 2>&1");
} }

2
python_apps/pypo/install/pypo-uninstall.py
View file

@ -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)

4
python_apps/pypo/scripts/ls_lib.liq
View file

@ -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

9
python_apps/pypo/scripts/notify.sh
View file

@ -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 &