Congegni/sintonia
7
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

CC-2410: Clean up install process

Browse source 
-hiding a few more warnings.
This commit is contained in:
martin 2011-06-20 17:38:18 -04:00
parent de436486fb
commit aa56344a29
6 changed files with 11 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

1
install/airtime-install
View file

@ -26,6 +26,7 @@ echo -e "\n*** Media Monitor Installation ***"
python ${SCRIPTPATH}/../python_apps/media-monitor/install/media-monitor-install.py
sleep 4
echo -e "\n*** Verifying your system environment ***"
airtime-check-system
echo -e "\n******************************* Install Complete *******************************"

2
install/include/AirtimeIni.php
View file

@ -89,7 +89,7 @@ class AirtimeIni
}
public static function RemoveMonitFile(){
unlink("/etc/monit/conf.d/airtime-monit.cfg");
@unlink("/etc/monit/conf.d/airtime-monit.cfg");
}
/**

2
install/include/airtime-uninstall.php
View file

@ -69,7 +69,7 @@ if ($dbDeleteFailed) {
// Delete the user
//------------------------------------------------------------------------
echo " * Deleting database user '{$CC_CONFIG['dsn']['username']}'...".PHP_EOL;
$command = "echo \"DROP USER IF EXISTS {$CC_CONFIG['dsn']['username']}\" | su postgres -c psql";
$command = "echo \"DROP USER IF EXISTS {$CC_CONFIG['dsn']['username']}\" | su postgres -c psql >/dev/null 2>&1";
@exec($command, $output, $results);
if ($results == 0) {
echo " * User '{$CC_CONFIG['dsn']['username']}' deleted.".PHP_EOL;