From 2efe2e67a8c5a71f01a5589ddc15c34d36536b16 Mon Sep 17 00:00:00 2001
From: martin <martin@martin-ThinkPad-T410.(none)>
Date: Tue, 21 Jun 2011 11:40:07 -0400
Subject: [PATCH] CC-2410: Clean up install process

-fixed missing DB::connect
---
 install/include/AirtimeInstall.php           |  1 -
 install/{ => include}/airtime-db-install.php | 12 +++++-------
 install/include/airtime-install.php          |  6 +++---
 install/include/airtime-uninstall.php        |  2 +-
 4 files changed, 9 insertions(+), 12 deletions(-)
 rename install/{ => include}/airtime-db-install.php (86%)

diff --git a/install/include/AirtimeInstall.php b/install/include/AirtimeInstall.php
index e88aab027..ff7ec7737 100644
--- a/install/include/AirtimeInstall.php
+++ b/install/include/AirtimeInstall.php
@@ -149,7 +149,6 @@ class AirtimeInstall
         $success = chmod($rp, 02777);
         $CC_CONFIG['storageDir'] = $rp;
 
-        AirtimeInstall::DbConnect(true);
         //add stor directory to MusiDirs
         $sql = "INSERT INTO cc_music_dirs (directory, type) VALUES ('$rp', 'stor')";
         $result = $CC_DBC->query($sql);
diff --git a/install/airtime-db-install.php b/install/include/airtime-db-install.php
similarity index 86%
rename from install/airtime-db-install.php
rename to install/include/airtime-db-install.php
index 7fd0a253d..c339b4e6d 100644
--- a/install/airtime-db-install.php
+++ b/install/include/airtime-db-install.php
@@ -2,8 +2,8 @@
 
 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(dirname(__FILE__).'/AirtimeIni.php');
+require_once(dirname(__FILE__).'/AirtimeInstall.php');
 
 require_once(AirtimeInstall::GetAirtimeSrcDir().'/application/configs/constants.php');
 require_once(AirtimeInstall::GetAirtimeSrcDir().'/application/configs/conf.php');
@@ -18,10 +18,9 @@ AirtimeInstall::DbConnect(true);
 
 AirtimeInstall::InstallPostgresScriptingLanguage();
 
-if(isset($argv[1]) && $argv[1] == 'y') {
+if (isset($argv[1]) && $argv[1] == 'y') {
     AirtimeInstall::CreateDatabaseTables();
-}
-else if ($databaseExisted){
+} else if ($databaseExisted) {
     //Database already exists. Ask the user how they want to
     //proceed. Warn them that creating the database tables again
     //will cause them to lose their old ones.
@@ -34,8 +33,7 @@ else if ($databaseExisted){
     if (in_array($userAnswer, array("y", "Y"))) {
         AirtimeInstall::CreateDatabaseTables();
     }
-}
-else {
+} else {
     //Database was just created, meaning the tables do not
     //exist. Let's create them.
     AirtimeInstall::CreateDatabaseTables();
diff --git a/install/include/airtime-install.php b/install/include/airtime-install.php
index 121077c0c..223a433b9 100644
--- a/install/include/airtime-install.php
+++ b/install/include/airtime-install.php
@@ -122,9 +122,9 @@ echo "* Airtime Version: ".AIRTIME_VERSION.PHP_EOL;
 
 if ($db_install) {
     if($newInstall) {
-        system('php airtime-db-install.php y');
-    }
-    else {
+        system('php '.__DIR__.'/airtime-db-install.php y');
+        AirtimeInstall::DbConnect(true);
+    } else {
         require_once('airtime-db-install.php');
     }
 }
diff --git a/install/include/airtime-uninstall.php b/install/include/airtime-uninstall.php
index da2a58ed3..361109c5b 100644
--- a/install/include/airtime-uninstall.php
+++ b/install/include/airtime-uninstall.php
@@ -90,6 +90,6 @@ AirtimeInstall::UninstallBinaries();
 AirtimeInstall::RemoveLogDirectories();
 AirtimeIni::RemoveMonitFile();
 
-unlink('/etc/cron.d/airtime-crons');
+@unlink('/etc/cron.d/airtime-crons');
 
 /* FINISHED AIRTIME PHP UNINSTALLER */