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

CC-2209:Put database install stuff into separate script 

Note: Please carefully review the changes as I'm not sure if I
did it correctly. I tested it and it installed fine in both
cases(without an option and with option -n followed by
db-install script.
This commit is contained in:
James Moon 2011-05-10 14:10:46 -07:00
parent f1a314aa0a
commit d9813f21a2
2 changed files with 38 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
install/airtime-db-install.php Normal file
View File

@ -0,0 +1,23 @@
<?php
set_include_path(__DIR__.'/../airtime_mvc/library' . PATH_SEPARATOR . get_include_path());
require_once(dirname(__FILE__).'/include/AirtimeIni.php');
require_once(dirname(__FILE__).'/include/AirtimeInstall.php');
require_once(AirtimeInstall::GetAirtimeSrcDir().'/application/configs/conf.php');
//echo PHP_EOL."*** Database Installation ***".PHP_EOL;
AirtimeInstall::CreateDatabaseUser();
AirtimeInstall::CreateDatabase();
AirtimeInstall::DbConnect(true);
AirtimeInstall::InstallPostgresScriptingLanguage();
AirtimeInstall::CreateDatabaseTables();
AirtimeInstall::SetAirtimeVersion(AIRTIME_VERSION);

23
install/airtime-install.php
View File

@ -22,7 +22,8 @@ try {
array(
'help|h' => 'Displays usage information.',
'overwrite|o' => 'Overwrite any existing config files.',
'preserve|p' => 'Keep any existing config files.'
'preserve|p' => 'Keep any existing config files.',
'no-db|n' => 'Turn off database install.'
)
);
$opts->parse();
@ -34,6 +35,10 @@ if (isset($opts->h)) {
echo $opts->getUsageMessage();
exit;
}
$db_install = true;
if (isset($opts->n)){
$db_install = false;
}
$overwrite = false;
if (isset($opts->o)) {
@ -72,17 +77,21 @@ require_once(AirtimeInstall::GetAirtimeSrcDir().'/application/configs/conf.php')
echo "* Airtime Version: ".AIRTIME_VERSION.PHP_EOL;
if ($db_install) {
//echo PHP_EOL."*** Database Installation ***".PHP_EOL;
AirtimeInstall::CreateDatabaseUser();
/* AirtimeInstall::CreateDatabaseUser();
AirtimeInstall::CreateDatabase();
AirtimeInstall::CreateDatabase();
AirtimeInstall::DbConnect(true);
AirtimeInstall::DbConnect(true);
AirtimeInstall::InstallPostgresScriptingLanguage();
AirtimeInstall::InstallPostgresScriptingLanguage();
AirtimeInstall::CreateDatabaseTables();
AirtimeInstall::CreateDatabaseTables();*/
require( 'airtime-db-install.php' );
}
AirtimeInstall::InstallStorageDirectory();
@ -98,7 +107,5 @@ system("python ".__DIR__."/../python_apps/pypo/install/pypo-install.py");
echo PHP_EOL."*** Recorder Installation ***".PHP_EOL;
system("python ".__DIR__."/../python_apps/show-recorder/install/recorder-install.py");
AirtimeInstall::SetAirtimeVersion(AIRTIME_VERSION);
echo "******************************* Install Complete *******************************".PHP_EOL;