friso/rpi-mqtt-monitor
Public Access
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix old git compatibility issue

Browse Source
This commit is contained in:
Hristo
2024-01-28 14:36:16 +02:00
parent 1885089bd9
commit 3ac098de69
1 changed files with 4 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/rpi-cpu2mqtt.py
View File

@@ -163,14 +163,10 @@ def check_git_version():
def check_git_version_remote(): def check_git_version_remote():
script_dir = os.path.dirname(os.path.realpath(__file__)) script_dir = os.path.dirname(os.path.realpath(__file__))
cmd = ['git', '-C', script_dir, 'ls-remote', '--tags', '--sort=-version:refname'] full_cmd = "git -C {} ls-remote --tags origin | awk -F'/' '{{print $3}}' | sort -V | tail -n 1".format(script_dir)
result = subprocess.run(cmd, capture_output=True, universal_newlines=True) result = subprocess.Popen(full_cmd, shell=True, stdout=subprocess.PIPE, stderr=subprocess.PIPE).communicate()[0].decode("utf-8")
lines = result.stdout.splitlines() latest_tag = result.strip()
if lines: return latest_tag if latest_tag else None
latest_tag = lines[0].split('/')[-1]
return latest_tag
else:
return None
def get_network_ip(): def get_network_ip():
s = socket.socket(socket.AF_INET, socket.SOCK_DGRAM) s = socket.socket(socket.AF_INET, socket.SOCK_DGRAM)