From 1468cf62b07b10ab3d87bca6f54b20dc8b816abd Mon Sep 17 00:00:00 2001 From: Britney Fransen <brfransen@gmail.com> Date: Thu, 7 Nov 2013 09:23:43 -0600 Subject: supplemental-web: bestart.cgi, bestop.cgi, beclear.cgi: update OSD messages --- abs/core/supplemental-web/PKGBUILD | 2 +- abs/core/supplemental-web/cgi/beclear.cgi | 2 +- abs/core/supplemental-web/cgi/bestart.cgi | 15 +++++++++------ abs/core/supplemental-web/cgi/bestop.cgi | 15 ++++++++------- 4 files changed, 19 insertions(+), 15 deletions(-) diff --git a/abs/core/supplemental-web/PKGBUILD b/abs/core/supplemental-web/PKGBUILD index 090b6ec..5448bcc 100644 --- a/abs/core/supplemental-web/PKGBUILD +++ b/abs/core/supplemental-web/PKGBUILD @@ -1,7 +1,7 @@ pkgbase=supplemental-web pkgname=('supplemental-web' 'supplemental-web-slave') pkgver=8.0 -pkgrel=11 +pkgrel=12 arch=('i686' 'x86_64') license=('GPL') backup=('data/srv/httpd/cgi/extra.cfg.txt') diff --git a/abs/core/supplemental-web/cgi/beclear.cgi b/abs/core/supplemental-web/cgi/beclear.cgi index 489466d..941c958 100644 --- a/abs/core/supplemental-web/cgi/beclear.cgi +++ b/abs/core/supplemental-web/cgi/beclear.cgi @@ -1,4 +1,4 @@ #!/bin/bash /usr/bin/mythbackend --clearcache -MESSAGE="settings cache is cleared " +MESSAGE="MythBackend Settings Cache Cleared" #/usr/bin/notify.py SYS "$MESSAGE" 2>/dev/null diff --git a/abs/core/supplemental-web/cgi/bestart.cgi b/abs/core/supplemental-web/cgi/bestart.cgi index e09e42b..a7a49b2 100644 --- a/abs/core/supplemental-web/cgi/bestart.cgi +++ b/abs/core/supplemental-web/cgi/bestart.cgi @@ -1,10 +1,13 @@ #!/bin/bash -# MESSAGE="Trying to start `hostname` B.E." -# /usr/bin/func "*" call msg display "$MESSAGE" & +#MESSAGE="Starting `hostname` MythBackend" +#/usr/bin/func "*" call msg display "$MESSAGE" & -sudo /sbin/sv start mythbackend - -MESSAGE="`hostname` B.E. started" -/usr/bin/func "*" call msg display "$MESSAGE" & +svresult=`sudo /sbin/sv start mythbackend` +if [[ $svresult == *"run: "* ]]; then + MESSAGE="`hostname` MythBackend Started" +else + MESSAGE="`hostname` MythBackend didn't Start\nCheck MythBackend Log" +fi +/usr/bin/func "*" call msg display "$MESSAGE" & diff --git a/abs/core/supplemental-web/cgi/bestop.cgi b/abs/core/supplemental-web/cgi/bestop.cgi index c9d7fad..2d31904 100644 --- a/abs/core/supplemental-web/cgi/bestop.cgi +++ b/abs/core/supplemental-web/cgi/bestop.cgi @@ -1,12 +1,13 @@ #!/bin/bash -MESSAGE="Trying to stop `hostname` B.E." -/usr/bin/func "*" call msg display "$MESSAGE" & - -sudo /sbin/sv stop mythbackend - -MESSAGE="`hostname` B.E. stopped" +MESSAGE="Stopping `hostname` MythBackend..." /usr/bin/func "*" call msg display "$MESSAGE" & +svresult=`sudo /sbin/sv stop mythbackend` +if [[ $svresult == *"down: "* ]]; then + MESSAGE="`hostname` MythBackend Stopped" +else + MESSAGE="`hostname` MythBackend didn't Stop" +fi - +/usr/bin/func "*" call msg display "$MESSAGE" & -- cgit v0.12