Re-apply fix for binary detection in gui

This commit is contained in:
Bernd Schoolmann 2024-02-09 19:00:20 +01:00
parent 83b808f44c
commit f1395d4b6d
No known key found for this signature in database
1 changed files with 10 additions and 1 deletions

View File

@ -10,6 +10,7 @@ if is_flatpak:
log_directory = str(Path.home()) + "/.var/app/com.quexten.goldwarden/data/goldwarden" log_directory = str(Path.home()) + "/.var/app/com.quexten.goldwarden/data/goldwarden"
os.makedirs(log_directory, exist_ok=True) os.makedirs(log_directory, exist_ok=True)
# detect goldwarden binary
BINARY_PATHS = [ BINARY_PATHS = [
"/app/bin/goldwarden", "/app/bin/goldwarden",
"/usr/bin/goldwarden", "/usr/bin/goldwarden",
@ -22,8 +23,16 @@ for path in BINARY_PATHS:
if os.path.exists(path): if os.path.exists(path):
BINARY_PATH = path BINARY_PATH = path
break break
if BINARY_PATH == None: if BINARY_PATH == None:
raise Exception("Could not find goldwarden binary") BINARY_PATH = which('goldwarden')
if isinstance(BINARY_PATH,str):
BINARY_PATH = BINARY_PATH.strip()
if BINARY_PATH == None:
print("goldwarden executable not found")
sys.exit()
authenticated_connection = None authenticated_connection = None
def create_authenticated_connection(token): def create_authenticated_connection(token):