CC-2796: airtime-install script has error exit 2 even when upgrade has gone perfectly

-fixed

install_minimal/airtime-install

@@ -59,7 +59,16 @@ virtualenv_bin="/usr/lib/airtime/airtime_virtualenv/bin/"
 echo -e "\n*** Creating Pypo User ***"
 python ${SCRIPTPATH}/../python_apps/create-pypo-user.py
 
+set +e
 php ${SCRIPTPATH}/include/airtime-install.php $@
+if [ "$?" -eq "2" ]; then
+    #We've just finished an upgrade, so let's exit
+    exit 0
+elif [ "$?" != "0" ]; then
+    #There was an error, exit with error code.
+    exit 1
+fi
+set -e
 
 echo -e "\n*** API Client Installation ***"
 python ${SCRIPTPATH}/../python_apps/api_clients/install/api_client_install.py

install_minimal/include/airtime-install.php

@@ -65,9 +65,6 @@ if (isset($version) && ($version != false) && ($version < AIRTIME_VERSION) && !i
 
     require_once("airtime-upgrade.php");
 
-    //Make sure to exit with non-zero error code so that airtime-install
-    //shell script does not continue with installing pypo, show-recorder,
-    //media-monitor etc.
     exit(2);
 }