From 45d63b9d8897fe060031354b523a174602e7e369 Mon Sep 17 00:00:00 2001 From: Maxim Baz Date: Sat, 16 Mar 2019 14:53:24 +0100 Subject: [PATCH] Fix order of respecting settings --- request/fetch.go | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/request/fetch.go b/request/fetch.go index 07ec53e..fd35610 100644 --- a/request/fetch.go +++ b/request/fetch.go @@ -65,11 +65,11 @@ func fetchDecryptedContents(request *request) { store.Path = normalizedStorePath var gpgPath string - if store.Settings.GpgPath != "" || request.Settings.GpgPath != "" { - if store.Settings.GpgPath != "" { - gpgPath = store.Settings.GpgPath - } else { + if request.Settings.GpgPath != "" || store.Settings.GpgPath != "" { + if request.Settings.GpgPath != "" { gpgPath = request.Settings.GpgPath + } else { + gpgPath = store.Settings.GpgPath } err = validateGpgBinary(gpgPath) if err != nil {