CC-3098: Upgrade scripts don't work

-minor tweaks

install_minimal/include/airtime-initialize.sh

@@ -18,13 +18,15 @@ AIRTIMEROOT=$SCRIPTPATH/../../
 #. ${virtualenv_bin}activate
 
 set +e
-php --php-ini ${SCRIPTPATH}/../airtime-php.ini ${SCRIPTPATH}/airtime-install.php $@
-result=$?
+if [ "$DO_UPGRADE" -eq "0" ]; then 
+    php --php-ini ${SCRIPTPATH}/../airtime-php.ini ${SCRIPTPATH}/airtime-install.php $@
+    result=$?
 
-if [ "$result" -ne "0" ]; then
-    #There was an error, exit with error code.
-    echo "There was an error during install. Exit code $result"
-    exit 1
+    if [ "$result" -ne "0" ]; then
+        #There was an error, exit with error code.
+        echo "There was an error during install. Exit code $result"
+        exit 1
+    fi
 fi
 set -e
 

install_minimal/include/airtime-install.php

@@ -67,9 +67,6 @@ if ($overwrite) {
     AirtimeIni::UpdateIniFiles();
 }
 
-//AirtimeInstall::InstallPhpCode(); //copies contents of airtime_mvc to /usr/share
-//AirtimeInstall::InstallBinaries(); //copies utils to /usr/lib/airtime
-
 // Update the build.properties file to point to the correct directory.
 AirtimeIni::UpdateIniValue(AirtimeInstall::CONF_DIR_WWW.'/build/build.properties', 'project.home', AirtimeInstall::CONF_DIR_WWW);
 
@@ -89,10 +86,6 @@ if ($db_install) {
     }
 }
 
-//AirtimeInstall::CreateSymlinksToUtils();
-
 AirtimeInstall::CreateZendPhpLogFile();
 
-//AirtimeInstall::CreateCronFile();
-
 /* FINISHED AIRTIME PHP INSTALLER */

install_minimal/include/airtime-upgrade.php

@@ -20,7 +20,9 @@ if(exec("whoami") != "root"){
 }
 
 function pause(){
-    /* change "AIRTIME_INSTALL_DEBUG=1" in base install file to enable this. */
+    /* Type "sudo -s" to change to root user then type "export AIRTIME_INSTALL_DEBUG=1" and then
+     * start airtime-install to enable this feature. Is used to pause between upgrade scripts
+     * to examine the state of the system and see if everything is as expected. */
     if (getenv("AIRTIME_INSTALL_DEBUG") === "1"){
         echo "Press Enter to Continue".PHP_EOL;
         fgets(STDIN);