vaultwarden/goldwarden-vaultwarden-bitwarden-client
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #109 from Mte90/patch-1

Browse Source 
better goldwarden command path detection
This commit is contained in:
Bernd Schoolmann 2024-02-09 16:13:20 +01:00 committed by GitHub
commit 8a41543601
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 9 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
ui/goldwarden.py
View File

@ -1,13 +1,19 @@
import subprocess import subprocess
import json import json
from shutil import which
import os import os
import sys
# if flatpak # if flatpak
if os.path.exists("/app/bin/goldwarden"): if os.path.exists("/app/bin/goldwarden"):
BINARY_PATH = "/app/bin/goldwarden" BINARY_PATH = "/app/bin/goldwarden"
else: else:
res = subprocess.run(["which", "goldwarden"]) BINARY_PATH = which('goldwarden')
BINARY_PATH = res.stdout.decode("utf-8").strip() if isinstance(BINARY_PATH,str):
BINARY_PATH = BINARY_PATH.strip()
else:
print("goldwarden executable not found")
sys.exit()
def set_api_url(url): def set_api_url(url):
restic_cmd = f"{BINARY_PATH} config set-api-url {url}" restic_cmd = f"{BINARY_PATH} config set-api-url {url}"
@ -181,4 +187,4 @@ def run_daemon():
print(line.decode("utf-8")) print(line.decode("utf-8"))
result.wait() result.wait()
print("quitting goldwarden daemon") print("quitting goldwarden daemon")
return result.returncode return result.returncode