yesBad/proton-bridge
1
0
Fork 0
forked from Silverfish/proton-bridge
Code Actions Activity

GODT-1516: Return notification on missing keychain

Browse Source
This commit is contained in:
Jakub
2022-02-23 12:00:20 +01:00
committed by Jakub Cuth
parent c920c53243
commit cf75ea739f
3 changed files with 38 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
pkg/keychain/helper_linux.go
View File

@ -35,17 +35,19 @@ const (
func init() { // nolint[noinit]
Helpers = make(map[string]helperConstructor)
Helpers[SecretService] = newSecretServiceHelper
if isUsable(newSecretServiceHelper("")) {
Helpers[SecretService] = newSecretServiceHelper
}
if _, err := exec.LookPath("pass"); err == nil {
if _, err := exec.LookPath("pass"); err == nil && isUsable(newPassHelper("")) {
Helpers[Pass] = newPassHelper
}
// If Pass is available, use it by default.
// Otherwise, if SecretService is available, use it by default.
if _, ok := Helpers[Pass]; ok && isUsable(newPassHelper("")) {
if _, ok := Helpers[Pass]; ok {
defaultHelper = Pass
} else if isUsable(newSecretServiceHelper("")) {
} else if _, ok := Helpers[SecretService]; ok {
defaultHelper = SecretService
}
}