From aeb9888f7f944b8f27b4f3a20a6896bf012b9bab Mon Sep 17 00:00:00 2001
From: Bernd Schoolmann <mail@quexten.com>
Date: Fri, 9 Feb 2024 22:51:37 +0100
Subject: [PATCH] Fix incorrect binary path

---
 com.quexten.Goldwarden.yml     | 8 ++++----
 gui/src/services/goldwarden.py | 7 ++++---
 2 files changed, 8 insertions(+), 7 deletions(-)

diff --git a/com.quexten.Goldwarden.yml b/com.quexten.Goldwarden.yml
index 8346b58..ff413c6 100644
--- a/com.quexten.Goldwarden.yml
+++ b/com.quexten.Goldwarden.yml
@@ -17,12 +17,12 @@ finish-args:
   - --talk-name=org.gnome.ScreenSaver
   - --talk-name=org.freedesktop.ScreenSaver
 
+  #  Lock on idle
+  - --talk-name=org.gnome.Mutter.IdleMonitor
+
   # Notifications
   - --talk-name=org.freedesktop.Notifications
 
-  # Home directory access to setup browser ipc, can posibly restrict this further if requried by listing each browser's nativehost directory separately
-  - --filesystem=home
-
   # pinentry & approval
   - --talk-name=org.gnome.keyring.SystemPrompter
   # biometric / user password auth
@@ -51,7 +51,7 @@ modules:
   - name: goldwarden-core-daemon
     buildsystem: simple
     build-commands:
-      - install -D goldwarden /app/bin/src/goldwarden
+      - install -D goldwarden /app/bin/goldwarden
     sources:
       - type: file
         path: ./goldwarden
\ No newline at end of file
diff --git a/gui/src/services/goldwarden.py b/gui/src/services/goldwarden.py
index af78447..141cb19 100644
--- a/gui/src/services/goldwarden.py
+++ b/gui/src/services/goldwarden.py
@@ -3,6 +3,8 @@ import json
 import os
 from pathlib import Path
 from threading import Thread
+from shutil import which
+import sys
 
 is_flatpak = os.path.exists("/.flatpak-info")
 log_directory = str(Path.home()) + "/.local/share/goldwarden"
@@ -17,19 +19,18 @@ BINARY_PATHS = [
     str(Path.home()) + "/go/src/github.com/quexten/goldwarden/goldwarden"
 ]
 
-BINARY_PATH = ""
 BINARY_PATH = None
 for path in BINARY_PATHS:
     if os.path.exists(path):
         BINARY_PATH = path
         break
 
-if BINARY_PATH == None:
+if BINARY_PATH is None:
     BINARY_PATH = which('goldwarden')
     if isinstance(BINARY_PATH,str):
         BINARY_PATH = BINARY_PATH.strip()
 
-if BINARY_PATH == None:
+if BINARY_PATH is None:
     print("goldwarden executable not found")
     sys.exit()