From 532dd036c1d4b51557507084912c53b571f166b4 Mon Sep 17 00:00:00 2001
From: Martin Konecny <martin.konecny@gmail.com>
Date: Thu, 10 May 2012 14:46:22 -0400
Subject: [PATCH] CC-3787- On upgrade, make sure user has all required debian
 packages.

-Just checking for the new packages introduced in 2.1 for now...
---
 install_full/ubuntu/airtime-full-install |  2 +-
 install_minimal/airtime-install          | 12 ++++++++++++
 2 files changed, 13 insertions(+), 1 deletion(-)

diff --git a/install_full/ubuntu/airtime-full-install b/install_full/ubuntu/airtime-full-install
index 0a69b89da..912bb0ec3 100755
--- a/install_full/ubuntu/airtime-full-install
+++ b/install_full/ubuntu/airtime-full-install
@@ -64,7 +64,7 @@ if [ ! -f /etc/apache2/sites-available/airtime ]; then
     a2dissite default
     a2ensite airtime
     a2enmod rewrite php5
-    service apache2 reload
+    service apache2 restart
 else
 	echo "Apache config for Airtime already exists..."
 fi
diff --git a/install_minimal/airtime-install b/install_minimal/airtime-install
index da7663a5f..06c317f08 100755
--- a/install_minimal/airtime-install
+++ b/install_minimal/airtime-install
@@ -86,6 +86,13 @@ ZENDFRAMEWORK=$?
 
 dpkg -l | grep libzend-framework-php > /dev/null 2>&1
 LIBZEND=$?
+
+dpkg -l | grep lsof > /dev/null 2>&1
+LSOF_EXIST=$?
+
+dpkg -l | grep sudo > /dev/null 2>&1
+SUDO_EXIST=$?
+
 set -e
 
 if [ "$ZENDFRAMEWORK" != "0" -a "$LIBZEND" != "0" ]; then
@@ -93,6 +100,11 @@ if [ "$ZENDFRAMEWORK" != "0" -a "$LIBZEND" != "0" ]; then
     exit 1
 fi
 
+if [ "$LSOF_EXIST" != "0" -o "$SUDO_EXIST" != "0" ]; then
+    echo "Packages missing. Please run airtime-full-install"
+    exit 1
+fi
+
 # Check if airtime exists already
 set +e
 php --php-ini ${SCRIPTPATH}/airtime-php.ini ${SCRIPTPATH}/include/airtime-installed-check.php