From 7744b3bda916998275369da8b0924669eaa2d8d6 Mon Sep 17 00:00:00 2001 From: mrjk Date: Mon, 17 Apr 2023 14:41:41 -0400 Subject: [PATCH] fix: gpg background process --- lib/idmgr_mod_gpg.sh | 21 +++++++++++++-------- 1 file changed, 13 insertions(+), 8 deletions(-) diff --git a/lib/idmgr_mod_gpg.sh b/lib/idmgr_mod_gpg.sh index e13db67..e55567b 100644 --- a/lib/idmgr_mod_gpg.sh +++ b/lib/idmgr_mod_gpg.sh @@ -88,15 +88,20 @@ idm_gpg__enable () unset GPG_AGENT_INFO fi - # Check if socket is present - if [ ! -S "${GPG_AGENT_INFO-}" ]; then - rm -f "${XDG_RUNTIME_DIR}/pgp-agent/${id}/env" - idm_gpg_start $id - fi + if [[ "${IDM_NO_BG:-false}" == true ]] || [[ -n "${DIRENV_IN_ENVRC-}" ]] ; then - # Show config to source - if [ -f "${XDG_RUNTIME_DIR}/pgp-agent/${id}/env" ]; then - cat "${XDG_RUNTIME_DIR}/pgp-agent/${id}/env" + # Check if socket is present + if [ ! -S "${GPG_AGENT_INFO-}" ]; then + rm -f "${XDG_RUNTIME_DIR}/pgp-agent/${id}/env" + idm_gpg_start $id + fi + + # Show config to source + if [ -f "${XDG_RUNTIME_DIR}/pgp-agent/${id}/env" ]; then + cat "${XDG_RUNTIME_DIR}/pgp-agent/${id}/env" + fi + else + lib_log WARN "Start of gpg-agent background process disabled because of: IDM_NO_BG=${IDM_NO_BG:-false}" fi # Export tty to the current shell