From 6bea1ab654d3ab67679ecfd462336c5ecb6dc370 Mon Sep 17 00:00:00 2001 From: martin Date: Fri, 17 Jun 2011 15:00:39 -0400 Subject: [PATCH] CC-2400: make sure we are using quotes when using rm -rf -done --- install/airtime-upgrade.php | 2 +- install/include/AirtimeInstall.php | 4 ++-- install/upgrades/airtime-1.9/airtime-upgrade.php | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/install/airtime-upgrade.php b/install/airtime-upgrade.php index 109a978ec..1cf4b8a3e 100644 --- a/install/airtime-upgrade.php +++ b/install/airtime-upgrade.php @@ -96,7 +96,7 @@ passthru("python ".__DIR__."/../python_apps/pypo/install/pypo-install.py"); echo PHP_EOL."*** Updating Recorder ***".PHP_EOL; passthru("python ".__DIR__."/../python_apps/show-recorder/install/recorder-install.py"); -echo PHP_EOL."*** Starting Media Monitor ***".PHP_EOL; +echo PHP_EOL."*** Updating Media Monitor ***".PHP_EOL; passthru("python ".__DIR__."/../python_apps/media-monitor/install/media-monitor-install.py"); diff --git a/install/include/AirtimeInstall.php b/install/include/AirtimeInstall.php index d35abfc90..6b5ef787c 100644 --- a/install/include/AirtimeInstall.php +++ b/install/include/AirtimeInstall.php @@ -323,7 +323,7 @@ class AirtimeInstall public static function UninstallPhpCode() { echo "* Removing PHP code from ".AirtimeInstall::CONF_DIR_WWW.PHP_EOL; - exec("rm -rf \"{${AirtimeInstall::CONF_DIR_WWW}}\""); + exec('rm -rf "'.AirtimeInstall::CONF_DIR_WWW.'"'); } public static function InstallBinaries() @@ -336,7 +336,7 @@ class AirtimeInstall public static function UninstallBinaries() { echo "* Removing Airtime binaries from ".AirtimeInstall::CONF_DIR_BINARIES.PHP_EOL; - exec("rm -rf \"{${AirtimeInstall::CONF_DIR_BINARIES}}\""); + exec('rm -rf "'.AirtimeInstall::CONF_DIR_BINARIES.'"'); } public static function DirCheck() diff --git a/install/upgrades/airtime-1.9/airtime-upgrade.php b/install/upgrades/airtime-1.9/airtime-upgrade.php index ca473a2f1..d988fb806 100644 --- a/install/upgrades/airtime-1.9/airtime-upgrade.php +++ b/install/upgrades/airtime-1.9/airtime-upgrade.php @@ -39,7 +39,7 @@ function InstallBinaries() function UninstallBinaries() { echo "* Removing Airtime binaries from ".CONF_DIR_BINARIES.PHP_EOL; - exec("rm -rf \"{${CONF_DIR_BINARIES}}\""); + exec('rm -rf "'.CONF_DIR_BINARIES.'"'); }