From ae274b09dc8555cf8800623c11591ce9fa7fbf46 Mon Sep 17 00:00:00 2001
From: martin <martin@martin-ThinkPad-T410.(none)>
Date: Wed, 26 Jan 2011 18:12:51 -0500
Subject: [PATCH] -update install/uninstall scripts

---
 install/airtime-install.php   | 10 +++++++---
 install/airtime-uninstall.php | 14 ++++++--------
 pypo/install/pypo-install.py  |  4 +---
 3 files changed, 14 insertions(+), 14 deletions(-)

diff --git a/install/airtime-install.php b/install/airtime-install.php
index 36b931454..16917259d 100644
--- a/install/airtime-install.php
+++ b/install/airtime-install.php
@@ -44,7 +44,7 @@ foreach($lines as $key => $line){
 fclose($fp);
  
 
-echo "******************************* Install Begin ********************************\n";
+echo "******************************** Install Begin *********************************\n";
 
 echo " *** Database Installation ***\n";
 
@@ -225,9 +225,13 @@ install_setDirPermissions($CC_CONFIG["storageDir"]);
 echo " * Importing sample audio clips \n";
 $command = __DIR__."/../utils/airtime-import --copy ../audio_samples/ > /dev/null";
 @exec($command, $output, $results);
-echo "****************************** Database Install Complete ******************************\n";
 
 $command = "python ".__DIR__."/../pypo/install/pypo-install.py";
+
+$output = array();
 @exec($command, $output, $results);
-//print_r($output);
+foreach ($output as $value){
+    echo $value."\n";
+}
+echo "******************************* Install Complete *******************************\n";
 ?>
diff --git a/install/airtime-uninstall.php b/install/airtime-uninstall.php
index d343365e3..c50b724cb 100644
--- a/install/airtime-uninstall.php
+++ b/install/airtime-uninstall.php
@@ -21,9 +21,7 @@ if(exec("whoami") != "root"){
 }
 
 
-echo "***************************\n";
-echo "* StorageServer Uninstall *\n";
-echo "***************************\n";
+echo "******************************* Uninstall Begin ********************************\n";
 
 require_once(dirname(__FILE__).'/../application/configs/conf.php');
 require_once(dirname(__FILE__).'/installInit.php');
@@ -226,11 +224,11 @@ if ($results == 0) {
 airtime_uninstall_delete_files($CC_CONFIG['storageDir']);
 
 
-echo "************************************\n";
-echo "* StorageServer Uninstall Complete *\n";
-echo "************************************\n";
-
 $command = "python ".__DIR__."/../pypo/install/pypo-uninstall.py";
+$output = array();
 @exec($command, $output, $results);
-//print_r($output);
+foreach ($output as $value){
+    echo $value."\n";
+}
+echo "****************************** Uninstall Complete ******************************\n";
 ?>
diff --git a/pypo/install/pypo-install.py b/pypo/install/pypo-install.py
index 4ff42d247..e82c2d314 100644
--- a/pypo/install/pypo-install.py
+++ b/pypo/install/pypo-install.py
@@ -150,9 +150,7 @@ try:
   print output
 
   if not found:
-    print "Install has completed, but daemontools is not running, please make sure you have it installed and then reboot."
-  else:
-    print "Install complete."
+    print "Pypo install has completed, but daemontools is not running, please make sure you have it installed and then reboot."
 except Exception, e:
   print "exception:" + str(e)