From eeb048cf08855b2b324f0afeac4d1fc10ff2f7d5 Mon Sep 17 00:00:00 2001 From: Pavel Loginov Date: Sun, 8 May 2022 19:35:10 +0300 Subject: [PATCH] v6.0.1.0 Changelog: https://roxy-wi.org/changelog.py#6_0_1 --- app/hapservers.py | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/app/hapservers.py b/app/hapservers.py index bac400ba..93aa719f 100644 --- a/app/hapservers.py +++ b/app/hapservers.py @@ -74,14 +74,12 @@ services_name = {'roxy-wi-checker': 'Master backends checker service', 'roxy-wi-keep_alive': 'Auto start service', 'roxy-wi-metrics': 'Master metrics service'} for s, v in services_name.items(): - if s != 'roxy-wi-keep_alive': - service_name = s.split('_')[0] - else: - service_name = s if distro.id() == 'ubuntu': - cmd = "apt list --installed 2>&1 |grep " + service_name + if s == 'roxy-wi-keep_alive': + s = 'roxy-wi-keep-alive' + cmd = "apt list --installed 2>&1 |grep " + s else: - cmd = "rpm --query " + service_name + "-* |awk -F\"" + service_name + "\" '{print $2}' |awk -F\".noa\" '{print $1}' |sed 's/-//1' |sed 's/-/./'" + cmd = "rpm --query " + s + "-* |awk -F\"" + s + "\" '{print $2}' |awk -F\".noa\" '{print $1}' |sed 's/-//1' |sed 's/-/./'" service_ver, stderr = funct.subprocess_execute(cmd) try: services.append([s, service_ver[0]])