From 96a2861cfa2ee7cff3eba82f66942cf67bb37659 Mon Sep 17 00:00:00 2001
From: Paul Baranowski <paul.baranowski@sourcefabric.org>
Date: Mon, 28 Mar 2011 15:38:41 -0400
Subject: [PATCH] Improved messages during install.

---
 install/airtime-install.php | 14 +++++++-------
 install/installInit.php     | 18 +++++++++++++++---
 2 files changed, 22 insertions(+), 10 deletions(-)

diff --git a/install/airtime-install.php b/install/airtime-install.php
index 7402b5355..aea7ea529 100644
--- a/install/airtime-install.php
+++ b/install/airtime-install.php
@@ -26,28 +26,28 @@ AirtimeInstall::UpdateIniValue('../build/build.properties', 'project.home', real
 
 echo PHP_EOL."*** Database Installation ***".PHP_EOL;
 
-echo "* Creating Airtime Database User".PHP_EOL;
+echo "* Creating Airtime database user".PHP_EOL;
 AirtimeInstall::CreateDatabaseUser();
 
-echo "* Creating Airtime Database".PHP_EOL;
+echo "* Creating Airtime database".PHP_EOL;
 AirtimeInstall::CreateDatabase();
 
 AirtimeInstall::DbConnect(true);
 
-echo "* Install Postgresql Scripting Language".PHP_EOL;
+echo "* Installing Postgresql scripting language".PHP_EOL;
 AirtimeInstall::InstallPostgresScriptingLanguage();
 
-echo "* Creating Database Tables".PHP_EOL;
+echo "* Creating database tables".PHP_EOL;
 AirtimeInstall::CreateDatabaseTables();
 AirtimeInstall::MigrateTables(__DIR__);
 
-echo "* Storage Directory Setup".PHP_EOL;
+echo "* Storage directory setup".PHP_EOL;
 AirtimeInstall::SetupStorageDirectory($CC_CONFIG);
 
-echo "* Setting Dir Permissions".PHP_EOL;
+echo "* Giving Apache permission to access the storage directory".PHP_EOL;
 AirtimeInstall::ChangeDirOwnerToWebserver($CC_CONFIG["storageDir"]);
 
-echo "* Importing Sample Audio Clips".PHP_EOL;
+echo "* Importing sample audio clips".PHP_EOL;
 system(__DIR__."/../utils/airtime-import --copy ../audio_samples/ > /dev/null");
 
 echo PHP_EOL."*** Pypo Installation ***".PHP_EOL;
diff --git a/install/installInit.php b/install/installInit.php
index 6723b063a..3f8930e12 100644
--- a/install/installInit.php
+++ b/install/installInit.php
@@ -144,9 +144,15 @@ class AirtimeInstall {
          
         @exec($command, $output, $results);
         if ($results == 0) {
-            echo "* User {$CC_CONFIG['dsn']['username']} created.".PHP_EOL;
+            echo "* Database user '{$CC_CONFIG['dsn']['username']}' created.".PHP_EOL;
         } else {
-            echo "* Could not create user {$CC_CONFIG['dsn']['username']}: $output".PHP_EOL;
+            if (count($output) > 0) {
+                echo "* Could not create user '{$CC_CONFIG['dsn']['username']}': ".PHP_EOL;
+                echo implode(PHP_EOL, $output);
+            }
+            else {
+                echo "* Database user '{$CC_CONFIG['dsn']['username']}' already exists.".PHP_EOL;
+            }
         }
     }
 
@@ -159,7 +165,13 @@ class AirtimeInstall {
         if ($results == 0) {
             echo "* Database '{$CC_CONFIG['dsn']['database']}' created.".PHP_EOL;
         } else {
-            echo "* Could not create database '{$CC_CONFIG['dsn']['database']}': $output".PHP_EOL;
+            if (count($output) > 0) {
+                echo "* Could not create database '{$CC_CONFIG['dsn']['database']}': ".PHP_EOL;
+                echo implode(PHP_EOL, $output);
+            }
+            else {
+                echo "* Database '{$CC_CONFIG['dsn']['database']}' already exists.".PHP_EOL;
+            }
         }
     }