From 931246907f0d26897871bcde2ceb3cfc3f9b4aaf Mon Sep 17 00:00:00 2001 From: Martin Konecny Date: Mon, 28 May 2012 14:42:35 -0400 Subject: [PATCH] small fix for ubuntu 10.04 full install script --- install_full/ubuntu/airtime-full-install | 2 ++ install_full/ubuntu/airtime-full-install-nginx | 2 ++ 2 files changed, 4 insertions(+) diff --git a/install_full/ubuntu/airtime-full-install b/install_full/ubuntu/airtime-full-install index 912bb0ec3..78158f7f9 100755 --- a/install_full/ubuntu/airtime-full-install +++ b/install_full/ubuntu/airtime-full-install @@ -87,8 +87,10 @@ echo "----------------------------------------------------" cd /etc/default/ sed -i 's/startup=0/startup=1/g' monit +set +e grep -q "include /etc/monit/conf.d" /etc/monit/monitrc RETVAL=$? +set -e if [ $RETVAL -ne 0 ] ; then mkdir -p /etc/monit/conf.d echo "include /etc/monit/conf.d/*" >> /etc/monit/monitrc diff --git a/install_full/ubuntu/airtime-full-install-nginx b/install_full/ubuntu/airtime-full-install-nginx index 04305e0f6..6a7ef551e 100755 --- a/install_full/ubuntu/airtime-full-install-nginx +++ b/install_full/ubuntu/airtime-full-install-nginx @@ -98,8 +98,10 @@ echo "----------------------------------------------------" cd /etc/default/ sed -i 's/startup=0/startup=1/g' monit +set +e grep -q "include /etc/monit/conf.d" /etc/monit/monitrc RETVAL=$? +set -e if [ $RETVAL -ne 0 ] ; then mkdir -p /etc/monit/conf.d echo "include /etc/monit/conf.d/*" >> /etc/monit/monitrc