From d9813f21a2c4181c968e416147206033e9675f25 Mon Sep 17 00:00:00 2001
From: James Moon <james.moon@sourcefabric.org>
Date: Tue, 10 May 2011 14:10:46 -0700
Subject: [PATCH] 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.
---
 install/airtime-db-install.php | 23 +++++++++++++++++++++++
 install/airtime-install.php    | 23 +++++++++++++++--------
 2 files changed, 38 insertions(+), 8 deletions(-)
 create mode 100644 install/airtime-db-install.php

diff --git a/install/airtime-db-install.php b/install/airtime-db-install.php
new file mode 100644
index 000000000..18db57f3b
--- /dev/null
+++ b/install/airtime-db-install.php
@@ -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);
+
diff --git a/install/airtime-install.php b/install/airtime-install.php
index 51ff49f81..8d0dfbce8 100644
--- a/install/airtime-install.php
+++ b/install/airtime-install.php
@@ -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;