From aa56344a29b883965958fceedaf77a499fae85a0 Mon Sep 17 00:00:00 2001 From: martin Date: Mon, 20 Jun 2011 17:38:18 -0400 Subject: [PATCH] CC-2410: Clean up install process -hiding a few more warnings. --- install/airtime-install | 1 + install/include/AirtimeIni.php | 2 +- install/include/airtime-uninstall.php | 2 +- python_apps/media-monitor/airtime-media-monitor-init-d | 4 ++-- python_apps/pypo/airtime-playout-init-d | 8 ++++---- python_apps/show-recorder/airtime-show-recorder-init-d | 4 ++-- 6 files changed, 11 insertions(+), 10 deletions(-) diff --git a/install/airtime-install b/install/airtime-install index c5b151823..f746e22b5 100755 --- a/install/airtime-install +++ b/install/airtime-install @@ -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 *******************************" diff --git a/install/include/AirtimeIni.php b/install/include/AirtimeIni.php index a6857b0a4..88ed2c677 100644 --- a/install/include/AirtimeIni.php +++ b/install/include/AirtimeIni.php @@ -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"); } /** diff --git a/install/include/airtime-uninstall.php b/install/include/airtime-uninstall.php index 27839ad6d..e8c1cc0b8 100644 --- a/install/include/airtime-uninstall.php +++ b/install/include/airtime-uninstall.php @@ -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; diff --git a/python_apps/media-monitor/airtime-media-monitor-init-d b/python_apps/media-monitor/airtime-media-monitor-init-d index 2c088938c..8bf311161 100755 --- a/python_apps/media-monitor/airtime-media-monitor-init-d +++ b/python_apps/media-monitor/airtime-media-monitor-init-d @@ -17,13 +17,13 @@ DAEMON=/usr/lib/airtime/media-monitor/airtime-media-monitor PIDFILE=/var/run/airtime-media-monitor.pid start () { - monit monitor airtime-media-monitor + monit monitor airtime-media-monitor >/dev/null 2>&1 start-stop-daemon --start --background --quiet --chuid $USERID:$GROUPID --make-pidfile --pidfile $PIDFILE --startas $DAEMON } stop () { # Send TERM after 5 seconds, wait at most 30 seconds. - monit unmonitor airtime-media-monitor + monit unmonitor airtime-media-monitor >/dev/null 2>&1 start-stop-daemon --stop --oknodo --retry TERM/5/0/30 --quiet --pidfile $PIDFILE rm -f $PIDFILE } diff --git a/python_apps/pypo/airtime-playout-init-d b/python_apps/pypo/airtime-playout-init-d index 038a83a42..b07a97d5d 100755 --- a/python_apps/pypo/airtime-playout-init-d +++ b/python_apps/pypo/airtime-playout-init-d @@ -20,21 +20,21 @@ DAEMON1=/usr/lib/airtime/pypo/bin/airtime-liquidsoap PIDFILE1=/var/run/airtime-liquidsoap.pid start () { - monit monitor airtime-playout + monit monitor airtime-playout >/dev/null 2>&1 start-stop-daemon --start --background --quiet --chuid $USERID:$GROUPID --make-pidfile --pidfile $PIDFILE0 --startas $DAEMON0 - monit monitor airtime-liquidsoap + monit monitor airtime-liquidsoap >/dev/null 2>&1 start-stop-daemon --start --background --quiet --chuid $USERID:$GROUPID --make-pidfile --pidfile $PIDFILE1 --startas $DAEMON1 } stop () { # Send TERM after 5 seconds, wait at most 30 seconds. - monit unmonitor airtime-playout + monit unmonitor airtime-playout >/dev/null 2>&1 start-stop-daemon --stop --oknodo --retry TERM/5/0/30 --quiet --pidfile $PIDFILE0 rm -f $PIDFILE0 - monit unmonitor airtime-liquidsoap + monit unmonitor airtime-liquidsoap >/dev/null 2>&1 start-stop-daemon --stop --oknodo --retry TERM/5/0/30 --quiet --pidfile $PIDFILE1 rm -f $PIDFILE1 } diff --git a/python_apps/show-recorder/airtime-show-recorder-init-d b/python_apps/show-recorder/airtime-show-recorder-init-d index 7058a0c4b..2689316ca 100755 --- a/python_apps/show-recorder/airtime-show-recorder-init-d +++ b/python_apps/show-recorder/airtime-show-recorder-init-d @@ -17,14 +17,14 @@ DAEMON=/usr/lib/airtime/show-recorder/airtime-show-recorder PIDFILE=/var/run/airtime-show-recorder.pid start () { - monit monitor airtime-show-recorder + monit monitor airtime-show-recorder >/dev/null 2>&1 start-stop-daemon --start --background --quiet --chuid $USERID:$GROUPID --make-pidfile --pidfile $PIDFILE --startas $DAEMON } stop () { # Send TERM after 5 seconds, wait at most 30 seconds. - monit unmonitor airtime-show-recorder + monit unmonitor airtime-show-recorder >/dev/null 2>&1 start-stop-daemon --stop --oknodo --retry TERM/5/0/30 --quiet --pidfile $PIDFILE rm -f $PIDFILE }