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

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

Browse source 
Conflicts:
	dev_tools/pr.sh
This commit is contained in:
Paul Baranowski 2011-04-15 14:46:07 -04:00
commit 6d39af6fb9
6 changed files with 35 additions and 18 deletions
Download patch file Download diff file Expand all files Collapse all files

12
install/airtime-upgrade.php
View file

@ -7,11 +7,11 @@
*/
require_once(dirname(__FILE__).'/include/AirtimeIni.php');
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');
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;

4
install/upgrades/airtime-1.8/airtime-upgrade.php
View file

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