From 86ca2c7fc45230a5aa71758e349c89ccd61e8f0e Mon Sep 17 00:00:00 2001
From: James <james@sourcefabric-DX4840.(none)>
Date: Tue, 26 Jul 2011 12:05:36 -0400
Subject: [PATCH] CC-2592: Full install issues running twice in a row

- use "rm -rf" instead of "rm" when deleting
/etc/apache2/sites-enabled/000-default

- append "include /etc/monit/conf.d/*" to /etc/monit/monitrc if
it's first time installing it.

- bypass python lib installation and patching if virtualenv
already exists
---
 install_full/ubuntu/airtime-full-install |  9 ++++++-
 install_minimal/airtime-install          | 30 ++++++++++++------------
 2 files changed, 23 insertions(+), 16 deletions(-)

diff --git a/install_full/ubuntu/airtime-full-install b/install_full/ubuntu/airtime-full-install
index 200149541..7e47cbd72 100755
--- a/install_full/ubuntu/airtime-full-install
+++ b/install_full/ubuntu/airtime-full-install
@@ -44,7 +44,7 @@ echo "2. Apache Config File"
 echo "----------------------------------------------------"
 if [ ! -f /etc/apache2/sites-available/airtime ]; then
 	sudo cp $SCRIPTPATH/../apache/airtime-vhost /etc/apache2/sites-available/airtime 
-	sudo rm /etc/apache2/sites-enabled/000-default
+	sudo rm -rf /etc/apache2/sites-enabled/000-default
 	sudo ln -s /etc/apache2/sites-available/airtime /etc/apache2/sites-enabled/airtime
 	sudo a2enmod rewrite php5
 	sudo service apache2 restart
@@ -68,6 +68,13 @@ echo "----------------------------------------------------"
 cd /etc/default/
 sudo sed -i 's/startup=0/startup=1/g' monit
 sudo cp $SCRIPTPATH/../../python_apps/monit/airtime-monit.cfg /etc/monit/conf.d
+
+grep -q "include /etc/monit/conf.d" /etc/monit/monitrc
+RETVAL=$?
+if [ $RETVAL -ne 0 ] ; then
+    sudo echo "include /etc/monit/conf.d/*" >> /etc/monit/monitrc 
+fi
+
 sudo service monit start
 
 # Run Airtime Install
diff --git a/install_minimal/airtime-install b/install_minimal/airtime-install
index ed9d4b23d..e96622858 100755
--- a/install_minimal/airtime-install
+++ b/install_minimal/airtime-install
@@ -11,24 +11,24 @@ VIRTUAL_ENV_DIR="/usr/lib/airtime/airtime_virtualenv"
 if [ ! -d "$VIRTUAL_ENV_DIR" ]; then
     echo -e "\n*** Creating Vitualenv for Airtime ***"
     sudo virtualenv --no-site-package -p /usr/bin/python2.6 /usr/lib/airtime/airtime_virtualenv
+    
+    echo -e "\n*** Installing Python Libraries ***"
+    sudo /usr/lib/airtime/airtime_virtualenv/bin/pip install ${SCRIPTPATH}/airtime_virtual_env.pybundle -E /usr/lib/airtime/airtime_virtualenv
+    
+    echo -e "\n*** Patching Python Libraries ***"
+    PACHES=${SCRIPTPATH}/patches/*
+    for file in $(find $PACHES -print); do
+        if [ -d $file ]; then
+            DIRNAME=$(basename $file)
+            echo -e "\n   ---Applying Patches for $DIRNAME---"
+        else
+            sudo patch -N -p0 -i $file
+        fi
+    done
 else
     echo -e "\n*** Existing Airtime Virturalenv Found ***"
-fi
+fi 
 
-echo -e "\n*** Installing Python Libraries ***"
-sudo /usr/lib/airtime/airtime_virtualenv/bin/pip install ${SCRIPTPATH}/airtime_virtual_env.pybundle -E /usr/lib/airtime/airtime_virtualenv
-
-echo -e "\n*** Patching Python Libraries ***"
-PACHES=${SCRIPTPATH}/patches/*
-for file in $(find $PACHES -print); do
-    if [ -d $file ]; then
-        DIRNAME=$(basename $file)
-        echo -e "\n   ---Applying Patches for $DIRNAME---"
-    else
-        sudo patch -N -p0 -i $file
-    fi
-done 
-cd
 virtualenv_bin="/usr/lib/airtime/airtime_virtualenv/bin/"
 . ${virtualenv_bin}activate