From 51efc44e6bd4bd0ee85281b88732b780eab19b55 Mon Sep 17 00:00:00 2001 From: Alexander Reinert Date: Sat, 5 Aug 2017 06:29:15 +0200 Subject: [PATCH] Made some changes to be compatible with YAHM --- addon/addon/server.tcl | 15 +++++++++------ addon/rc.d/check_mk_agent | 2 +- addon/update_script | 5 ----- check/homematic | 2 +- 4 files changed, 11 insertions(+), 13 deletions(-) diff --git a/addon/addon/server.tcl b/addon/addon/server.tcl index 978719f..cb16023 100755 --- a/addon/addon/server.tcl +++ b/addon/addon/server.tcl @@ -49,10 +49,14 @@ proc handle_connection { channelId clientAddress clientPort } { puts $channelId "[exec sed 1,2d /proc/net/dev]" puts $channelId "<<>>" - if { [regexp CCU2 [exec grep Hardware < /proc/cpuinfo]] == 0 } { - puts $channelId "[exec df -PTk | sed 1d]" - } else { + if { [exec busybox | sed -n 1p | awk { { print $2 } }] == "v1.20.2" } { puts $channelId "[exec df -Pk | sed 1d]" + } else { + puts $channelId "[exec df -PTk | sed 1d]" + puts $channelId "<<>>" + puts $channelId "\[df_inodes_start\]" + puts $channelId "[exec df -PTi | sed 1d]" + puts $channelId "\[df_inodes_end\]" } puts $channelId "<<>>" @@ -146,7 +150,7 @@ proc get_homematic_bidcos_devices { } { } } } - + proc read_var { filename varname } { set fd [open $filename r] set var "" @@ -162,7 +166,7 @@ proc read_var { filename varname } { proc get_version { } { return [read_var /boot/VERSION VERSION] } - + proc main { } { startup @@ -184,4 +188,3 @@ if { [catch { main } err] } then { log $err exit 1 } - diff --git a/addon/rc.d/check_mk_agent b/addon/rc.d/check_mk_agent index ac49bfd..206c91d 100755 --- a/addon/rc.d/check_mk_agent +++ b/addon/rc.d/check_mk_agent @@ -23,7 +23,7 @@ case "$1" in info) echo "Info: (Inoffical) check_mk agent" - echo "Version: 1.1" + echo "Version: 1.2" echo "Name: check_mk_agent" echo "Operations: uninstall restart" ;; diff --git a/addon/update_script b/addon/update_script index b23d08e..f1f65f4 100755 --- a/addon/update_script +++ b/addon/update_script @@ -5,11 +5,6 @@ CONFIG_DIR=/usr/local/etc/config ADDON_DIR=/usr/local/addons/${ADDONNAME} RCD_DIR=${CONFIG_DIR}/rc.d -mount | grep /usr/local 2>&1 >/dev/null -if [ $? -eq 1 ]; then - mount /usr/local -fi - # create necessary directories mkdir -p ${ADDON_DIR} chmod 755 ${ADDON_DIR} diff --git a/check/homematic b/check/homematic index 0b46542..f6eea23 100644 --- a/check/homematic +++ b/check/homematic @@ -15,6 +15,6 @@ 'plugins/wato/homematic.py']}, 'name': 'homematic', 'title': 'Homematic', - 'version': '1.1', + 'version': '1.2', 'version.min_required': '1.2.8', 'version.packaged': '1.4.0p8'}