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

full path for git binary

Browse Source
This commit is contained in:
Hristo
2024-02-11 14:17:53 +02:00
parent adfc000b6c
commit 35f15f9799
2 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/rpi-cpu2mqtt.py
View File

@@ -163,7 +163,7 @@ def check_git_update(script_dir):
def check_git_version(script_dir): def check_git_version(script_dir):
full_cmd = "git -C {} describe --tags `git -C {} rev-list --tags --max-count=1`".format(script_dir, script_dir) full_cmd = "/usr/bin/git -C {} describe --tags `/usr/bin/git -C {} rev-list --tags --max-count=1`".format(script_dir, script_dir)
git_version = subprocess.Popen(full_cmd, shell=True, stdout=subprocess.PIPE, stderr=subprocess.PIPE).communicate()[0].decode("utf-8").replace('\n', '') git_version = subprocess.Popen(full_cmd, shell=True, stdout=subprocess.PIPE, stderr=subprocess.PIPE).communicate()[0].decode("utf-8").replace('\n', '')
return(git_version) return(git_version)

2
src/update.py
View File

@@ -77,7 +77,7 @@ def do_update(script_dir, version=config.version, git_update=True, config_update
print("Current version: {}".format(config.version)) print("Current version: {}".format(config.version))
if git_update: if git_update:
print(":: Updating git repository", script_dir) print(":: Updating git repository", script_dir)
result = subprocess.run(['git', '-C', script_dir, 'pull'], check=True, universal_newlines=True, stdout=subprocess.PIPE) result = subprocess.run(['/usr/bin/git', '-C', script_dir, 'pull'], check=True, universal_newlines=True, stdout=subprocess.PIPE)
print(result.stdout) print(result.stdout)
if display_config_differences(script_dir + '/config.py', script_dir + '/config.py.example') and config_update: if display_config_differences(script_dir + '/config.py', script_dir + '/config.py.example') and config_update: