From 948a0e584dc6b51845fa1dcb773f305d932e77cd Mon Sep 17 00:00:00 2001
From: martin <martin@martin-ThinkPad-T410.(none)>
Date: Fri, 17 Jun 2011 11:16:27 -0400
Subject: [PATCH] -added quotes to all paths in rm -rf statements

---
 install/include/AirtimeInstall.php                        | 8 ++++----
 install/upgrades/airtime-1.9/airtime-upgrade.php          | 5 +++--
 .../media-monitor/install/media-monitor-uninstall.py      | 2 +-
 python_apps/pypo/install/pypo-uninstall.py                | 2 +-
 python_apps/show-recorder/install/recorder-uninstall.py   | 2 +-
 5 files changed, 10 insertions(+), 9 deletions(-)

diff --git a/install/include/AirtimeInstall.php b/install/include/AirtimeInstall.php
index dbbff57b6..d35abfc90 100644
--- a/install/include/AirtimeInstall.php
+++ b/install/include/AirtimeInstall.php
@@ -277,7 +277,7 @@ class AirtimeInstall
 
     public static function DeleteFilesRecursive($p_path)
     {
-        $command = "rm -rf $p_path";
+        $command = "rm -rf \"$p_path\"";
         exec($command);
     }
 
@@ -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()
@@ -386,6 +386,6 @@ class AirtimeInstall
         $path = AirtimeInstall::CONF_DIR_LOG;
         echo "* Removing logs directory ".$path.PHP_EOL;
 
-        exec("rm -rf $path");
+        exec("rm -rf \"$path\"");
     }
 }
diff --git a/install/upgrades/airtime-1.9/airtime-upgrade.php b/install/upgrades/airtime-1.9/airtime-upgrade.php
index 0727c9c64..ca473a2f1 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}}\"");
 }
 
 
@@ -74,7 +74,7 @@ $pathnames = array("/usr/bin/airtime-pypo-start",
 
 foreach ($pathnames as $pn){
     echo "Removing $pn\n";
-    exec("rm -rf ".$pn);
+    exec("rm -rf \"$pn\"");
 }
 
 
@@ -82,6 +82,7 @@ $values = parse_ini_file(CONF_FILE_AIRTIME, true);
 $phpDir = $values['general']['airtime_dir'];
 
 InstallPhpCode($phpDir);
+AirtimeIni::CreateMonitFile();
 
 //update utils (/usr/lib/airtime) folder
 UninstallBinaries();
diff --git a/python_apps/media-monitor/install/media-monitor-uninstall.py b/python_apps/media-monitor/install/media-monitor-uninstall.py
index d2732bffb..4f587d46b 100755
--- a/python_apps/media-monitor/install/media-monitor-uninstall.py
+++ b/python_apps/media-monitor/install/media-monitor-uninstall.py
@@ -12,7 +12,7 @@ if os.geteuid() != 0:
 PATH_INI_FILE = '/etc/airtime/media-monitor.cfg'
 
 def remove_path(path):
-    os.system("rm -rf " + path)
+    os.system('rm -rf "%s"' % path)
 
 def get_current_script_dir():
   current_script_dir = os.path.realpath(__file__)
diff --git a/python_apps/pypo/install/pypo-uninstall.py b/python_apps/pypo/install/pypo-uninstall.py
index bfa77eb0e..7b7cf881f 100755
--- a/python_apps/pypo/install/pypo-uninstall.py
+++ b/python_apps/pypo/install/pypo-uninstall.py
@@ -12,7 +12,7 @@ if os.geteuid() != 0:
 PATH_INI_FILE = '/etc/airtime/pypo.cfg'
 
 def remove_path(path):
-    os.system("rm -rf " + path)
+    os.system('rm -rf "%s"' % path)
 
 def get_current_script_dir():
   current_script_dir = os.path.realpath(__file__)
diff --git a/python_apps/show-recorder/install/recorder-uninstall.py b/python_apps/show-recorder/install/recorder-uninstall.py
index 14cb63504..df4511428 100755
--- a/python_apps/show-recorder/install/recorder-uninstall.py
+++ b/python_apps/show-recorder/install/recorder-uninstall.py
@@ -12,7 +12,7 @@ if os.geteuid() != 0:
 PATH_INI_FILE = '/etc/airtime/recorder.cfg'
 
 def remove_path(path):
-    os.system("rm -rf " + path)
+    os.system('rm -rf "%s"' % path)
 
 def get_current_script_dir():
   current_script_dir = os.path.realpath(__file__)