From b482316c7454c1b7ee060537339b84043f26ed5a Mon Sep 17 00:00:00 2001
From: Britney Fransen <brfransen@gmail.com>
Date: Fri, 13 Mar 2015 21:37:47 +0000
Subject: xymon: fix mythtv binding for xymonclient

---
 abs/core/xymon/PKGBUILD            | 9 +++++----
 abs/core/xymon/hobbit_myth_data.py | 3 +--
 abs/core/xymon/xymon-hddtemp.sh    | 6 +++---
 3 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/abs/core/xymon/PKGBUILD b/abs/core/xymon/PKGBUILD
index 310e2a5..b8e6355 100755
--- a/abs/core/xymon/PKGBUILD
+++ b/abs/core/xymon/PKGBUILD
@@ -1,7 +1,7 @@
 pkgbase=xymon
 pkgname=('xymonserver' 'xymonclient')
 pkgver=4.3.17
-pkgrel=15
+pkgrel=17
 pkgdesc="Xymon is a system for monitoring of hosts and networks"
 license="GPL"
 arch=('i686' 'x86_64')
@@ -99,8 +99,9 @@ package_xymonserver(){
 
     install -D -m644 ${srcdir}/logrotate-server.xymon ${pkgdir}/etc/logrotate.d/xymon-server
 
-    # fix env for mythtb bindingds
+    # fix env for mythtv bindings
     echo "MYTHCONFDIR=/usr/share/mythtv" >> ${pkgdir}/home/xymon/etc/xymonserver.cfg
+    echo "MYTHCONFDIR=/usr/share/mythtv" >> ${pkgdir}/home/xymon/client/etc/xymonclient.cfg
 
     #copy in replacment icon set
     DOCDIR=${pkgdir}/data/srv/httpd/htdocs/xymon
@@ -178,9 +179,9 @@ md5sums=('d8d119a777e7b7204d1292fb27314312'
          '270e13da6cbc9d49079d994edaa71e64'
          '22d4c9065fd959efe82f121dcb511305'
          '9af2ad60ac4c3cb653754618f603e311'
-         'a9b7f0a22f29f55b2928160bc44f2c14'
+         '313b11e7a22c3c08fb2afaadbfb46d87'
          '6452d891d88bb46d07bcf7790a523ad0'
-         '374ce9cc7b7cb8ae04bf89ed4d79a7be'
+         'f0486d82a56a0e28a20278daabbc4c53'
          '9569e07936e337b06c194e0fb29e7e6b'
          'b4e8641e97e6b689dbc634af785e6799'
          'e2844513e2c92e8b5084818f3b2a478d'
diff --git a/abs/core/xymon/hobbit_myth_data.py b/abs/core/xymon/hobbit_myth_data.py
index ec16818..618e2ac 100755
--- a/abs/core/xymon/hobbit_myth_data.py
+++ b/abs/core/xymon/hobbit_myth_data.py
@@ -7,7 +7,7 @@ import urllib2
 import string
 import time , datetime
 import sys,os
-from MythTV import MythBE,MythDB,MythLog
+from MythTV import MythDB,MythLog
 
 
 #0=green
@@ -77,7 +77,6 @@ def find_data_left():
     days_left = 0
     today = datetime.datetime.today()
     try:
-        be=MythBE()
         db = MythDB()
         cursor = db.cursor()
     except:
diff --git a/abs/core/xymon/xymon-hddtemp.sh b/abs/core/xymon/xymon-hddtemp.sh
index 6961919..6c0f109 100755
--- a/abs/core/xymon/xymon-hddtemp.sh
+++ b/abs/core/xymon/xymon-hddtemp.sh
@@ -6,7 +6,7 @@ ls /dev/disk/by-id/* | grep -ve '-part' -ve '/wwn-' |
 while read DISK
 do
     DISKDEV=`ls -l $DISK | awk -F/ '{print $NF}'`
-    DISKNAME=`echo $DISK | awk -F/ '{print $5}'`
+    DISKNAME=`echo $DISK | awk -F/ '{print $5}' | tr ":" "_"`
 
     #check if disk is removable
     RM=0
@@ -23,10 +23,10 @@ do
     then
         TEMP="- No Temp Sensor Found"
         COLOR="4&clear"
-    elif test $hddtemp -gt 50
+    elif test $hddtemp -gt 55
     then
         COLOR="1&red"
-    elif test $hddtemp -ge 45
+    elif test $hddtemp -ge 50
     then
         COLOR="2&yellow"
     else
-- 
cgit v0.12

