-fixes to upgrade script

install_minimal/airtime-install

@@ -59,7 +59,7 @@ virtualenv_bin="/usr/lib/airtime/airtime_virtualenv/bin/"
 
 python $AIRTIMEROOT/python_apps/create-pypo-user.py
 
-if [ "$DO_UPGRADE" = "1" ]; then
+if [ "$DO_UPGRADE" -eq "1" ]; then
     #do upgrade
     php --php-ini ${SCRIPTPATH}/airtime-php.ini ${SCRIPTPATH}/include/airtime-upgrade.php $@
 fi
@@ -74,7 +74,7 @@ deactivate
 
 echo -e "\n*** Verifying your system environment, running airtime-check-system ***"
 sleep 10
-airtime-check-system
+airtime-check-system --no-color
 
 
 echo -e "\n******************************* Install Complete *******************************"

install_minimal/include/airtime-copy-files.sh

@@ -56,8 +56,6 @@ echo "$MIN $HOUR * * * root /usr/lib/airtime/utils/phone_home_stat" > /etc/cron.
 
 echo "* Creating /usr/lib/airtime"
 
-rm -rf "/usr/lib/airtime"
-
 if [ "$WEB_ONLY" -eq "0" ]; then
     python $AIRTIMEROOT/python_apps/api_clients/install/api_client_install.py
     python $AIRTIMEROOT/python_apps/pypo/install/pypo-copy-files.py

install_minimal/include/airtime-initialize.sh

@@ -30,7 +30,7 @@ if [ "$DO_UPGRADE" -eq "0" ]; then
 fi
 set -e
 
-if [ "$WEB_ONLY" -eq "1" ]; then
+if [ "$WEB_ONLY" -eq "0" ]; then
     python $AIRTIMEROOT/python_apps/pypo/install/pypo-initialize.py
     python $AIRTIMEROOT/python_apps/media-monitor/install/media-monitor-initialize.py
     python $AIRTIMEROOT/python_apps/show-recorder/install/recorder-initialize.py