From 8d40aa6e63c8b85c0cec1ffa8ec5cd75f6b8f9a5 Mon Sep 17 00:00:00 2001 From: jreichmann Date: Sun, 10 Mar 2019 08:51:03 +0100 Subject: [PATCH] Fixed GPG-Agent having wrong options and erroring out if agent is not running instead of starting it --- gnupg/gnupg_agent | 5 +++-- gnupg/gpg-agent.conf | 4 +--- 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/gnupg/gnupg_agent b/gnupg/gnupg_agent index 987de5b..1de5761 100755 --- a/gnupg/gnupg_agent +++ b/gnupg/gnupg_agent @@ -1,11 +1,12 @@ #!/bin/bash -if [ $(pgrep gpg-agent) != 0 ]; then +rc=$(pgrep gpg-agent) +if [ "$rc" != 0 ]; then export GPG_AGENT_INFO export SSH_AUTH_SOCK export SSH_AGENT_PID else - eval $(gpg-agent --daemon ~/.gpg-agent-info) + eval $(gpg-agent --daemon) fi gpg-connect-agent /bye diff --git a/gnupg/gpg-agent.conf b/gnupg/gpg-agent.conf index 62ecae5..d3ca444 100644 --- a/gnupg/gpg-agent.conf +++ b/gnupg/gpg-agent.conf @@ -2,8 +2,6 @@ default-cache-ttl 300 default-cache-ttl-ssh 300 max-cache-ttl 300 max-cache-ttl-ssh 300 - -ingore-cache-for-signing no-allow-external-cache - enable-ssh-support +ignore-cache-for-signing