From 3ac098de6921786f5072ab4b5bb8286532df83c9 Mon Sep 17 00:00:00 2001 From: Hristo Date: Sun, 28 Jan 2024 14:36:16 +0200 Subject: [PATCH] fix old git compatibility issue --- src/rpi-cpu2mqtt.py | 12 ++++-------- 1 file changed, 4 insertions(+), 8 deletions(-) diff --git a/src/rpi-cpu2mqtt.py b/src/rpi-cpu2mqtt.py index a73c527..144fb0c 100644 --- a/src/rpi-cpu2mqtt.py +++ b/src/rpi-cpu2mqtt.py @@ -163,14 +163,10 @@ def check_git_version(): def check_git_version_remote(): script_dir = os.path.dirname(os.path.realpath(__file__)) - cmd = ['git', '-C', script_dir, 'ls-remote', '--tags', '--sort=-version:refname'] - result = subprocess.run(cmd, capture_output=True, universal_newlines=True) - lines = result.stdout.splitlines() - if lines: - latest_tag = lines[0].split('/')[-1] - return latest_tag - else: - return None + full_cmd = "git -C {} ls-remote --tags origin | awk -F'/' '{{print $3}}' | sort -V | tail -n 1".format(script_dir) + result = subprocess.Popen(full_cmd, shell=True, stdout=subprocess.PIPE, stderr=subprocess.PIPE).communicate()[0].decode("utf-8") + latest_tag = result.strip() + return latest_tag if latest_tag else None def get_network_ip(): s = socket.socket(socket.AF_INET, socket.SOCK_DGRAM)