Merge pull request #71 from 404GamerNotFound/codex/behebe-codebug-bei-entitaten

fix: ensure service checks always set status values

Author: 404GamerNotFound

addon/vserver_ssh_stats/app/remote_script.py

@@ -97,24 +97,22 @@
   sock_cmd="netstat -tuln"
 fi
 
-if [ -n "$sock_cmd" ] && $sock_cmd 2>/dev/null | grep -E ':22\\s' >/dev/null; then
-  ssh_enabled="yes"
-else
-  ssh_enabled="no"
-fi
-
-if [ -n "$sock_cmd" ] && $sock_cmd 2>/dev/null | grep -E ':(80|443)\\s' >/dev/null; then
-  web="yes"
-else
-  web="no"
+ssh_enabled="no"
+web="no"
+vnc="no"
+if [ -n "$sock_cmd" ]; then
+  if $sock_cmd 2>/dev/null | grep -E ':22\\s' >/dev/null; then
+    ssh_enabled="yes"
+  fi
+  if $sock_cmd 2>/dev/null | grep -E ':(80|443)\\s' >/dev/null; then
+    web="yes"
+  fi
+  if $sock_cmd 2>/dev/null | grep -E ':5900\\s' >/dev/null; then
+    vnc="yes"
+  fi
 fi
-
-if [ -n "$sock_cmd" ] && $sock_cmd 2>/dev/null | grep -E ':5900\\s' >/dev/null; then
+if [ "$vnc" = "no" ] && (command -v vncserver >/dev/null 2>&1 || command -v x11vnc >/dev/null 2>&1); then
   vnc="yes"
-elif command -v vncserver >/dev/null 2>&1 || command -v x11vnc >/dev/null 2>&1; then
-  vnc="yes"
-else
-  vnc="no"
 fi
 
 # TEMP (°C, best-effort)

custom_components/vserver_ssh_stats/remote_script.py

@@ -99,24 +99,22 @@
   sock_cmd="netstat -tuln"
 fi
 
-if [ -n "$sock_cmd" ] && $sock_cmd 2>/dev/null | grep -E ':22\\s' >/dev/null; then
-  ssh_enabled="yes"
-else
-  ssh_enabled="no"
-fi
-
-if [ -n "$sock_cmd" ] && $sock_cmd 2>/dev/null | grep -E ':(80|443)\\s' >/dev/null; then
-  web="yes"
-else
-  web="no"
+ssh_enabled="no"
+web="no"
+vnc="no"
+if [ -n "$sock_cmd" ]; then
+  if $sock_cmd 2>/dev/null | grep -E ':22\\s' >/dev/null; then
+    ssh_enabled="yes"
+  fi
+  if $sock_cmd 2>/dev/null | grep -E ':(80|443)\\s' >/dev/null; then
+    web="yes"
+  fi
+  if $sock_cmd 2>/dev/null | grep -E ':5900\\s' >/dev/null; then
+    vnc="yes"
+  fi
 fi
-
-if [ -n "$sock_cmd" ] && $sock_cmd 2>/dev/null | grep -E ':5900\\s' >/dev/null; then
+if [ "$vnc" = "no" ] && (command -v vncserver >/dev/null 2>&1 || command -v x11vnc >/dev/null 2>&1); then
   vnc="yes"
-elif command -v vncserver >/dev/null 2>&1 || command -v x11vnc >/dev/null 2>&1; then
-  vnc="yes"
-else
-  vnc="no"
 fi
 
 # TEMP (°C, best-effort)