improved TELNETPORT definition&detection

fhem · Sep 17, 2018 · ff57fac · ff57fac
1 parent f697321
commit ff57fac
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 2 deletions.
diff --git a/src/entry.sh b/src/entry.sh
@@ -51,7 +51,8 @@ if [ -d "/fhem" ]; then
   [ -z "$(cat ${FHEM_DIR}/fhem.cfg | grep 'attr global dnsServer')" ] && echo "attr global dnsServer ${DNS}" >> ${FHEM_DIR}/fhem.cfg
   [ -z "$(cat ${FHEM_DIR}/fhem.cfg | grep 'attr global mseclog')" ] && echo "attr global mseclog 1" >> ${FHEM_DIR}/fhem.cfg
   [ -z "$(cat ${FHEM_DIR}/fhem.cfg | grep 'attr global updateInBackground')" ] && echo "attr global updateInBackground 1" >> ${FHEM_DIR}/fhem.cfg
-  [ -z "$(cat ${FHEM_DIR}/fhem.cfg | grep ' telnet ${TELNETPORT}')" ] && echo "define telnetPort telnet ${TELNETPORT}" >> ${FHEM_DIR}/fhem.cfg
+  [ -z "$(cat ${FHEM_DIR}/fhem.cfg | grep " telnet ${TELNETPORT}")" ] && [ -z "$(cat ${FHEM_DIR}/fhem.cfg | grep '^define telnetPort telnet ')" ] && echo "define telnetPort telnet ${TELNETPORT}" >> ${FHEM_DIR}/fhem.cfg
+  fi
   sed -i "s,attr global updateInBackground.*,attr global updateInBackground 1," ${FHEM_DIR}/fhem.cfg
   (( i++ ))
 

diff --git a/src/health-check.sh b/src/health-check.sh
@@ -1,7 +1,17 @@
 #!/bin/bash
 
-STATE=0
+FHEM_DIR="/opt/fhem"
 TELNETPORT="${TELNETPORT:-7072}"
+STATE=0
+
+if [ -z "$(cat ${FHEM_DIR}/fhem.cfg | grep " telnet ${TELNETPORT}")" ]; then
+  TELNETPORT="$(cat ${FHEM_DIR}/fhem.cfg | grep '^define telnetPort telnet ' | cut -d ' ' -f 4)"
+
+  if [ -z "${TELNETPORT}"]; then
+    echo "Telnet(undefined): FAILED;"
+    exit 1
+  fi
+fi
 
 FHEMWEB=$( cd /opt/fhem; perl fhem.pl ${TELNETPORT} "jsonlist2 TYPE=FHEMWEB:FILTER=TEMPORARY!=1" 2>/dev/null )
 if [ $? -ne 0 ] || [ -z "${FHEMWEB}" ]; then