From fccaa554f5320cc7430155c907c5334a11f1a546 Mon Sep 17 00:00:00 2001 From: Martin Konecny Date: Fri, 28 Oct 2011 17:24:38 -0400 Subject: [PATCH] CC-2758: Make airtime-install script Debian/Ubuntu compatible -further tweaks --- install_minimal/airtime-install | 5 +++++ install_minimal/include/airtime-copy-files.sh | 4 ---- install_minimal/include/airtime-initialize.sh | 4 ---- install_minimal/include/airtime-remove-files.sh | 11 +++++------ install_minimal/include/airtime-uninitialize.sh | 8 ++++---- .../install/media-monitor-uninitialize.py | 10 +++++++--- python_apps/pypo/install/pypo-uninitialize.py | 10 +++++++--- .../show-recorder/install/recorder-remove-files.py | 6 +++--- .../show-recorder/install/recorder-uninitialize.py | 10 +++++++--- 9 files changed, 38 insertions(+), 30 deletions(-) diff --git a/install_minimal/airtime-install b/install_minimal/airtime-install index e51465fb1..1fc2bff04 100755 --- a/install_minimal/airtime-install +++ b/install_minimal/airtime-install @@ -42,4 +42,9 @@ python $SCRIPTPATH/../python_apps/create-pypo-user.py $SCRIPTPATH/include/airtime-copy-files.sh $SCRIPTPATH/include/airtime-initialize.sh $@ + +echo -e "\n*** Verifying your system environment, running airtime-check-system ***" +sleep 10 +airtime-check-system + echo -e "\n******************************* Install Complete *******************************" diff --git a/install_minimal/include/airtime-copy-files.sh b/install_minimal/include/airtime-copy-files.sh index ef3adff9b..aaf663746 100755 --- a/install_minimal/include/airtime-copy-files.sh +++ b/install_minimal/include/airtime-copy-files.sh @@ -45,10 +45,6 @@ HOUR=$(($RANDOM%24)) MIN=$(($RANDOM%60)) echo "$MIN $HOUR * * * root /usr/lib/airtime/utils/phone_home_stat" > /etc/cron.d/airtime-crons -#cp $AIRTIMEROOT/python_apps/show-recorder/airtime-show-recorder-init-d /etc/init.d/airtime-show-recorder -#cp $AIRTIMEROOT/python_apps/media-monitor/airtime-media-monitor-init-d /etc/init.d/airtime-media-monitor -#cp $AIRTIMEROOT/python_apps/pypo/airtime-playout-init-d /etc/init.d/airtime-playout - #cp $AIRTIMEROOT/python_apps/monit/monit-airtime-generic.cfg /etc/monit/conf.d/ #cp $AIRTIMEROOT/python_apps/monit/monit-airtime-rabbitmq-server.cfg /etc/monit/conf.d/ #cp $AIRTIMEROOT/python_apps/media-monitor/monit-airtime-media-monitor.cfg /etc/monit/conf.d/ diff --git a/install_minimal/include/airtime-initialize.sh b/install_minimal/include/airtime-initialize.sh index 9489315a1..91fb92f75 100755 --- a/install_minimal/include/airtime-initialize.sh +++ b/install_minimal/include/airtime-initialize.sh @@ -50,7 +50,3 @@ monit monitor airtime-playout monit monitor airtime-show-recorder #monit monitor rabbitmq-server set -e - -echo -e "\n*** Verifying your system environment ***" -sleep 10 -airtime-check-system diff --git a/install_minimal/include/airtime-remove-files.sh b/install_minimal/include/airtime-remove-files.sh index e5abbe66f..b52402d91 100755 --- a/install_minimal/include/airtime-remove-files.sh +++ b/install_minimal/include/airtime-remove-files.sh @@ -29,23 +29,22 @@ AIRTIMEROOT=$SCRIPTPATH/../../ rm -f /etc/cron.d/airtime-crons -echo "API Client" +echo "* API Client" python $AIRTIMEROOT/python_apps/api_clients/install/api_client_uninstall.py -echo "Pypo" +echo "* Pypo" python $AIRTIMEROOT/python_apps/pypo/install/pypo-remove-files.py -echo "Media-Monitor" +echo "* Media-Monitor" python $AIRTIMEROOT/python_apps/media-monitor/install/media-monitor-remove-files.py -echo "Show-Recorder" +echo "* Show-Recorder" python $AIRTIMEROOT/python_apps/show-recorder/install/recorder-remove-files.py -rm -rf /usr/lib/airtime - #remove symlinks rm -f /usr/bin/airtime-import rm -f /usr/bin/airtime-update-db-settings rm -f /usr/bin/airtime-check-system rm -f /usr/bin/airtime-log +rm -rf /usr/lib/airtime rm -rf /usr/share/airtime rm -rf /var/log/airtime diff --git a/install_minimal/include/airtime-uninitialize.sh b/install_minimal/include/airtime-uninitialize.sh index ee9212f91..a912b00ae 100755 --- a/install_minimal/include/airtime-uninitialize.sh +++ b/install_minimal/include/airtime-uninitialize.sh @@ -16,10 +16,10 @@ AIRTIMEROOT=$SCRIPTPATH/../../ #unmonitor services echo "Unmonitoring Airtime Services" set +e -monit unmonitor airtime-media-monitor -monit unmonitor airtime-liquidsoap -monit unmonitor airtime-playout -monit unmonitor airtime-show-recorder +monit unmonitor airtime-media-monitor >/dev/null 2>&1 +monit unmonitor airtime-liquidsoap >/dev/null 2>&1 +monit unmonitor airtime-playout >/dev/null 2>&1 +monit unmonitor airtime-show-recorder >/dev/null 2>&1 #monit unmonitor rabbitmq-server set -e diff --git a/python_apps/media-monitor/install/media-monitor-uninitialize.py b/python_apps/media-monitor/install/media-monitor-uninitialize.py index 364049663..0063406aa 100644 --- a/python_apps/media-monitor/install/media-monitor-uninitialize.py +++ b/python_apps/media-monitor/install/media-monitor-uninitialize.py @@ -7,8 +7,12 @@ if os.geteuid() != 0: sys.exit(1) try: - print "Waiting for media-monitor processes to stop..." - p = Popen("/etc/init.d/airtime-media-monitor stop", shell=True) - sts = os.waitpid(p.pid, 0)[1] + print "Waiting for media-monitor processes to stop...", + if (os.path.exists('/etc/init.d/airtime-playout')): + p = Popen("/etc/init.d/airtime-media-monitor stop", shell=True) + sts = os.waitpid(p.pid, 0)[1] + print "OK" + else: + print "Wasn't running" except Exception, e: print e diff --git a/python_apps/pypo/install/pypo-uninitialize.py b/python_apps/pypo/install/pypo-uninitialize.py index f9443e4aa..864d94a3d 100644 --- a/python_apps/pypo/install/pypo-uninitialize.py +++ b/python_apps/pypo/install/pypo-uninitialize.py @@ -8,8 +8,12 @@ if os.geteuid() != 0: try: #stop pypo and liquidsoap processes - print "Waiting for pypo processes to stop..." - p = Popen("/etc/init.d/airtime-playout stop", shell=True) - sts = os.waitpid(p.pid, 0)[1] + print "Waiting for pypo processes to stop...", + if (os.path.exists('/etc/init.d/airtime-playout')): + p = Popen("/etc/init.d/airtime-playout stop", shell=True) + sts = os.waitpid(p.pid, 0)[1] + print "OK" + else: + print "Wasn't running" except Exception, e: print e diff --git a/python_apps/show-recorder/install/recorder-remove-files.py b/python_apps/show-recorder/install/recorder-remove-files.py index 45f7553ef..abe4ca15f 100644 --- a/python_apps/show-recorder/install/recorder-remove-files.py +++ b/python_apps/show-recorder/install/recorder-remove-files.py @@ -29,15 +29,15 @@ try: #remove bin dir print "* Removing Show-Recorder Program Directories" - shutil.rmtree(config["bin_dir"]) + shutil.rmtree(config["bin_dir"], ignore_errors=True) #remove log dir print "* Removing Show-Recorder Log Directory" - shutil.rmtree(config["log_dir"]) + shutil.rmtree(config["log_dir"], ignore_errors=True) #remove temporary media-storage dir print "* Removing Show-Recorder Temporary Directory" - shutil.rmtree(config["base_recorded_files"]) + shutil.rmtree(config["base_recorded_files"], ignore_errors=True) #remove monit files print "* Removing Show-Recorder Monit Files" diff --git a/python_apps/show-recorder/install/recorder-uninitialize.py b/python_apps/show-recorder/install/recorder-uninitialize.py index 8d56df7c8..82808b159 100644 --- a/python_apps/show-recorder/install/recorder-uninitialize.py +++ b/python_apps/show-recorder/install/recorder-uninitialize.py @@ -7,9 +7,13 @@ if os.geteuid() != 0: sys.exit(1) try: - print "Waiting for show-recorder processes to stop..." - p = Popen("/etc/init.d/airtime-show-recorder stop", shell=True) - sts = os.waitpid(p.pid, 0)[1] + print "Waiting for show-recorder processes to stop...", + if (os.path.exists('/etc/init.d/airtime-playout')): + p = Popen("/etc/init.d/airtime-show-recorder stop", shell=True) + sts = os.waitpid(p.pid, 0)[1] + print "OK" + else: + print "Wasn't running" except Exception, e: print e