From 153a89430a007b0534ad1267343643b2166d92f2 Mon Sep 17 00:00:00 2001
From: martin <martin@martin-ThinkPad-T410.(none)>
Date: Tue, 20 Sep 2011 11:25:56 -0400
Subject: [PATCH] CC-2845: airtime reinstall doesn't work when php uses --file
 parameter

-fix install/upgrade/reinstall issues that Daniel found.
---
 install_full/ubuntu/airtime-full-install    |  2 +-
 install_minimal/airtime-install             |  5 +++++
 install_minimal/airtime-uninstall           |  5 +++++
 install_minimal/include/airtime-upgrade.php | 16 ++++++++--------
 4 files changed, 19 insertions(+), 9 deletions(-)

diff --git a/install_full/ubuntu/airtime-full-install b/install_full/ubuntu/airtime-full-install
index 3d37c9c85..190c7ebb9 100755
--- a/install_full/ubuntu/airtime-full-install
+++ b/install_full/ubuntu/airtime-full-install
@@ -7,7 +7,7 @@ exec > >(tee install_log.txt)
 exec 2>&1
 
 if [ "$(id -u)" != "0" ]; then
-	echo "You need root privileges to run this script"
+    echo "Please run as root user."
 	exit 1
 fi
 
diff --git a/install_minimal/airtime-install b/install_minimal/airtime-install
index be37b3dce..edf89e3ef 100755
--- a/install_minimal/airtime-install
+++ b/install_minimal/airtime-install
@@ -2,6 +2,11 @@
 #-e Causes bash script to exit if any of the installers
 #return with a non-zero return value.
 
+if [ `whoami` != 'root' ]; then
+    echo "Please run as root user."
+    exit 1
+fi
+
 set +e
 DEB=$(dpkg -s airtime 2> /dev/null | grep Status)
 set -e
diff --git a/install_minimal/airtime-uninstall b/install_minimal/airtime-uninstall
index 3ac9bf7f4..565433b67 100755
--- a/install_minimal/airtime-uninstall
+++ b/install_minimal/airtime-uninstall
@@ -1,5 +1,10 @@
 #!/bin/bash
 
+if [ `whoami` != 'root' ]; then
+    echo "Please run as root user."
+    exit 1
+fi
+
 VIRTUAL_ENV_DIR="/usr/lib/airtime/airtime_virtualenv"
 if [ ! -d "$VIRTUAL_ENV_DIR" ]; then
     echo -e "\nAirtime is not installed, cannot uninstall.\n"
diff --git a/install_minimal/include/airtime-upgrade.php b/install_minimal/include/airtime-upgrade.php
index 5781678e7..c85c2f300 100644
--- a/install_minimal/include/airtime-upgrade.php
+++ b/install_minimal/include/airtime-upgrade.php
@@ -54,28 +54,28 @@ $version = substr($version, 0, 5);
 $SCRIPTPATH = __DIR__;
 
 if (strcmp($version, "1.7.0") < 0){
-    passthru("php --php-ini $SCRIPTPATH/../airtime-php.ini --file $SCRIPTPATH/../upgrades/airtime-1.7.0/airtime-upgrade.php");
+    passthru("php --php-ini $SCRIPTPATH/../airtime-php.ini $SCRIPTPATH/../upgrades/airtime-1.7.0/airtime-upgrade.php");
 }
 if (strcmp($version, "1.8.0") < 0){
-    passthru("php --php-ini $SCRIPTPATH/../airtime-php.ini --file $SCRIPTPATH/../upgrades/airtime-1.8.0/airtime-upgrade.php");
+    passthru("php --php-ini $SCRIPTPATH/../airtime-php.ini $SCRIPTPATH/../upgrades/airtime-1.8.0/airtime-upgrade.php");
 }
 if (strcmp($version, "1.8.1") < 0){
-    passthru("php --php-ini $SCRIPTPATH/../airtime-php.ini --file $SCRIPTPATH/../upgrades/airtime-1.8.1/airtime-upgrade.php");
+    passthru("php --php-ini $SCRIPTPATH/../airtime-php.ini $SCRIPTPATH/../upgrades/airtime-1.8.1/airtime-upgrade.php");
 }
 if (strcmp($version, "1.8.2") < 0){
-    passthru("php --php-ini $SCRIPTPATH/../airtime-php.ini --file $SCRIPTPATH/../upgrades/airtime-1.8.2/airtime-upgrade.php");
+    passthru("php --php-ini $SCRIPTPATH/../airtime-php.ini $SCRIPTPATH/../upgrades/airtime-1.8.2/airtime-upgrade.php");
 }
 if (strcmp($version, "1.9.0") < 0){
-    passthru("php --php-ini $SCRIPTPATH/../airtime-php.ini --file $SCRIPTPATH/../upgrades/airtime-1.9.0/airtime-upgrade.php");
+    passthru("php --php-ini $SCRIPTPATH/../airtime-php.ini $SCRIPTPATH/../upgrades/airtime-1.9.0/airtime-upgrade.php");
 }
 if (strcmp($version, "1.9.2") < 0){
-    passthru("php --php-ini $SCRIPTPATH/../airtime-php.ini --file $SCRIPTPATH/../upgrades/airtime-1.9.2/airtime-upgrade.php");
+    passthru("php --php-ini $SCRIPTPATH/../airtime-php.ini $SCRIPTPATH/../upgrades/airtime-1.9.2/airtime-upgrade.php");
 }
 if (strcmp($version, "1.9.3") < 0){
-    passthru("php --php-ini $SCRIPTPATH/../airtime-php.ini --file $SCRIPTPATH/../upgrades/airtime-1.9.3/airtime-upgrade.php");
+    passthru("php --php-ini $SCRIPTPATH/../airtime-php.ini $SCRIPTPATH/../upgrades/airtime-1.9.3/airtime-upgrade.php");
 }
 if (strcmp($version, "1.9.4") < 0){
-    passthru("php --php-ini $SCRIPTPATH/../airtime-php.ini --file $SCRIPTPATH/../upgrades/airtime-1.9.4/airtime-upgrade.php");
+    passthru("php --php-ini $SCRIPTPATH/../airtime-php.ini $SCRIPTPATH/../upgrades/airtime-1.9.4/airtime-upgrade.php");
 }
 
 //set the new version in the database.