From 0492ba79c7e7297fc3af119c48cadf6d0a89fafa Mon Sep 17 00:00:00 2001 From: james Date: Mon, 30 May 2011 15:46:13 -0400 Subject: [PATCH] CC-2277:Rename airtime-pypo to airtime-playout --- install/upgrades/airtime-1.9/airtime-upgrade.php | 3 +++ .../pypo/{airtime-pypo-start => airtime-playout-start} | 0 .../pypo/{airtime-pypo-stop => airtime-playout-stop} | 0 python_apps/pypo/install/pypo-install.py | 10 +++++----- python_apps/pypo/install/pypo-uninstall.py | 6 +++--- 5 files changed, 11 insertions(+), 8 deletions(-) rename python_apps/pypo/{airtime-pypo-start => airtime-playout-start} (100%) rename python_apps/pypo/{airtime-pypo-stop => airtime-playout-stop} (100%) diff --git a/install/upgrades/airtime-1.9/airtime-upgrade.php b/install/upgrades/airtime-1.9/airtime-upgrade.php index 99ff40ee5..3998202ba 100644 --- a/install/upgrades/airtime-1.9/airtime-upgrade.php +++ b/install/upgrades/airtime-1.9/airtime-upgrade.php @@ -11,4 +11,7 @@ require_once __DIR__.'/../../../airtime_mvc/application/configs/conf.php'; require_once(dirname(__FILE__).'/../../include/AirtimeInstall.php'); require_once(dirname(__FILE__).'/../../include/AirtimeIni.php'); +unlink('/usr/bin/airtime-pypo-start'); +unlink('/usr/bin/airtime-pypo-stop'); + AirtimeInstall::CreateZendPhpLogFile(); diff --git a/python_apps/pypo/airtime-pypo-start b/python_apps/pypo/airtime-playout-start similarity index 100% rename from python_apps/pypo/airtime-pypo-start rename to python_apps/pypo/airtime-playout-start diff --git a/python_apps/pypo/airtime-pypo-stop b/python_apps/pypo/airtime-playout-stop similarity index 100% rename from python_apps/pypo/airtime-pypo-stop rename to python_apps/pypo/airtime-playout-stop diff --git a/python_apps/pypo/install/pypo-install.py b/python_apps/pypo/install/pypo-install.py index 716521d88..3cddd3b71 100755 --- a/python_apps/pypo/install/pypo-install.py +++ b/python_apps/pypo/install/pypo-install.py @@ -137,10 +137,10 @@ try: os.system("chown -R pypo:pypo "+config["cache_base_dir"]) print "Creating symbolic links" - os.system("rm -f /usr/bin/airtime-pypo-start") - os.system("ln -s "+config["bin_dir"]+"/bin/airtime-pypo-start /usr/bin/") - os.system("rm -f /usr/bin/airtime-pypo-stop") - os.system("ln -s "+config["bin_dir"]+"/bin/airtime-pypo-stop /usr/bin/") + os.system("rm -f /usr/bin/airtime-playout-start") + os.system("ln -s "+config["bin_dir"]+"/bin/airtime-playout-start /usr/bin/") + os.system("rm -f /usr/bin/airtime-playout-stop") + os.system("ln -s "+config["bin_dir"]+"/bin/airtime-playout-stop /usr/bin/") print "Installing pypo daemon" create_path("/etc/service/pypo") @@ -160,7 +160,7 @@ try: print "Waiting for processes to start..." time.sleep(5) - os.system("python /usr/bin/airtime-pypo-start") + os.system("python /usr/bin/airtime-playout-start") time.sleep(2) found = True diff --git a/python_apps/pypo/install/pypo-uninstall.py b/python_apps/pypo/install/pypo-uninstall.py index 242787a25..36ae334e0 100755 --- a/python_apps/pypo/install/pypo-uninstall.py +++ b/python_apps/pypo/install/pypo-uninstall.py @@ -37,14 +37,14 @@ try: print 'Error loading config file: ', e sys.exit() - os.system("python /usr/bin/airtime-pypo-stop") + os.system("python /usr/bin/airtime-playout-stop") print "Removing cache directories" remove_path(config["cache_base_dir"]) print "Removing symlinks" - os.system("rm -f /usr/bin/airtime-pypo-start") - os.system("rm -f /usr/bin/airtime-pypo-stop") + os.system("rm -f /usr/bin/airtime-playout-start") + os.system("rm -f /usr/bin/airtime-playout-stop") print "Removing pypo files" remove_path(config["bin_dir"])