-added quotes to all paths in rm -rf statements

This commit is contained in:
martin 2011-06-17 11:16:27 -04:00
parent 2f5a1c4df6
commit 948a0e584d
5 changed files with 10 additions and 9 deletions

View File

@ -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\"");
}
}

View File

@ -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();

View File

@ -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__)

View File

@ -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__)

View File

@ -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__)