Fix incorrect binary path
This commit is contained in:
parent
01f36cc571
commit
aeb9888f7f
2 changed files with 8 additions and 7 deletions
|
|
@ -17,12 +17,12 @@ finish-args:
|
||||||
- --talk-name=org.gnome.ScreenSaver
|
- --talk-name=org.gnome.ScreenSaver
|
||||||
- --talk-name=org.freedesktop.ScreenSaver
|
- --talk-name=org.freedesktop.ScreenSaver
|
||||||
|
|
||||||
|
# Lock on idle
|
||||||
|
- --talk-name=org.gnome.Mutter.IdleMonitor
|
||||||
|
|
||||||
# Notifications
|
# Notifications
|
||||||
- --talk-name=org.freedesktop.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
|
# pinentry & approval
|
||||||
- --talk-name=org.gnome.keyring.SystemPrompter
|
- --talk-name=org.gnome.keyring.SystemPrompter
|
||||||
# biometric / user password auth
|
# biometric / user password auth
|
||||||
|
|
@ -51,7 +51,7 @@ modules:
|
||||||
- name: goldwarden-core-daemon
|
- name: goldwarden-core-daemon
|
||||||
buildsystem: simple
|
buildsystem: simple
|
||||||
build-commands:
|
build-commands:
|
||||||
- install -D goldwarden /app/bin/src/goldwarden
|
- install -D goldwarden /app/bin/goldwarden
|
||||||
sources:
|
sources:
|
||||||
- type: file
|
- type: file
|
||||||
path: ./goldwarden
|
path: ./goldwarden
|
||||||
|
|
@ -3,6 +3,8 @@ import json
|
||||||
import os
|
import os
|
||||||
from pathlib import Path
|
from pathlib import Path
|
||||||
from threading import Thread
|
from threading import Thread
|
||||||
|
from shutil import which
|
||||||
|
import sys
|
||||||
|
|
||||||
is_flatpak = os.path.exists("/.flatpak-info")
|
is_flatpak = os.path.exists("/.flatpak-info")
|
||||||
log_directory = str(Path.home()) + "/.local/share/goldwarden"
|
log_directory = str(Path.home()) + "/.local/share/goldwarden"
|
||||||
|
|
@ -17,19 +19,18 @@ BINARY_PATHS = [
|
||||||
str(Path.home()) + "/go/src/github.com/quexten/goldwarden/goldwarden"
|
str(Path.home()) + "/go/src/github.com/quexten/goldwarden/goldwarden"
|
||||||
]
|
]
|
||||||
|
|
||||||
BINARY_PATH = ""
|
|
||||||
BINARY_PATH = None
|
BINARY_PATH = None
|
||||||
for path in BINARY_PATHS:
|
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 is None:
|
||||||
BINARY_PATH = which('goldwarden')
|
BINARY_PATH = which('goldwarden')
|
||||||
if isinstance(BINARY_PATH,str):
|
if isinstance(BINARY_PATH,str):
|
||||||
BINARY_PATH = BINARY_PATH.strip()
|
BINARY_PATH = BINARY_PATH.strip()
|
||||||
|
|
||||||
if BINARY_PATH == None:
|
if BINARY_PATH is None:
|
||||||
print("goldwarden executable not found")
|
print("goldwarden executable not found")
|
||||||
sys.exit()
|
sys.exit()
|
||||||
|
|
||||||
|
|
|
||||||
Loading…
Reference in a new issue