From dfa508a9eabd19597a18791c0547a2fbb9811ddc Mon Sep 17 00:00:00 2001 From: Naomi Date: Fri, 15 Apr 2011 13:25:52 -0400 Subject: [PATCH] changing paths with new folder structure --- install/airtime-upgrade.php | 8 +++++++- install/upgrades/airtime-1.8/airtime-upgrade.php | 4 ++-- 2 files changed, 9 insertions(+), 3 deletions(-) diff --git a/install/airtime-upgrade.php b/install/airtime-upgrade.php index f5f8ccc62..c1c6436fa 100644 --- a/install/airtime-upgrade.php +++ b/install/airtime-upgrade.php @@ -11,7 +11,7 @@ set_include_path(__DIR__.'/../airtime_mvc/library' . PATH_SEPARATOR . get_includ require_once __DIR__.'/../airtime_mvc/application/configs/conf.php'; require_once(dirname(__FILE__).'/include/AirtimeInstall.php'); -AirtimeIni::ExitIfNotRoot(); +AirtimeInstall::ExitIfNotRoot(); AirtimeInstall::DbConnect(true); if(AirtimeInstall::DbTableExists('cc_show_rebroadcast') === true) { @@ -34,6 +34,12 @@ if(strcmp($version, "1.8.0") < 0) { AirtimeInstall::SetAirtimeVersion(AIRTIME_VERSION); +echo PHP_EOL."*** Updating Pypo ***".PHP_EOL; +system("python ".__DIR__."/../python_apps/pypo/install/pypo-install.py"); + +echo PHP_EOL."*** Updating Recorder ***".PHP_EOL; +system("python ".__DIR__."/../python_apps/show-recorder/install/recorder-install.py"); + echo "******************************* Update Complete *******************************".PHP_EOL; diff --git a/install/upgrades/airtime-1.8/airtime-upgrade.php b/install/upgrades/airtime-1.8/airtime-upgrade.php index fdf79bdec..0b05e1c41 100644 --- a/install/upgrades/airtime-1.8/airtime-upgrade.php +++ b/install/upgrades/airtime-1.8/airtime-upgrade.php @@ -6,8 +6,8 @@ * @license http://www.gnu.org/licenses/gpl.txt */ -set_include_path(__DIR__.'/../../../library' . PATH_SEPARATOR . get_include_path()); -require_once __DIR__.'/../../../application/configs/conf.php'; +set_include_path(__DIR__.'/../../../airtime_mvc/library' . PATH_SEPARATOR . get_include_path()); +require_once __DIR__.'/../../../airtime_mvc/application/configs/conf.php'; require_once(dirname(__FILE__).'/../../include/AirtimeInstall.php'); AirtimeInstall::DbConnect(true);