From 7eacba464c90a6a63308237e5e33876b526db26a Mon Sep 17 00:00:00 2001 From: Maria Haider Date: Thu, 7 Oct 2021 15:28:51 +0200 Subject: [PATCH] updated post-tasks file --- global/post-tasks.d/015cosmos-trust | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/global/post-tasks.d/015cosmos-trust b/global/post-tasks.d/015cosmos-trust index cbb748f9..1f3e7484 100755 --- a/global/post-tasks.d/015cosmos-trust +++ b/global/post-tasks.d/015cosmos-trust @@ -32,7 +32,7 @@ for k in $COSMOS_KEYS/*.pub; do # Silently ignore empty files continue fi - pubkeys_in_file=$(cosmos gpg --with-colons --with-fingerprint < $k | grep "^pub:") + pubkeys_in_file=$(cosmos gpg --with-colons --with-fingerprint < $k 2>&1 | grep "^pub:") non_expired_pubkeys_in_file=$(echo ${pubkeys_in_file} | awk -F: '$2 != "e" { print $0 }') if [[ ! $non_expired_pubkeys_in_file ]]; then echo -e "$0: ${red}Ignoring file with expired pubkey: ${k}${reset}" @@ -46,10 +46,10 @@ for k in $COSMOS_KEYS/*.pub; do if [[ ! ${KEYRING[$fp]} ]]; then echo -e "$0: ${bold}Importing new key ${fp}${reset} from ${k}" - cosmos gpg --import < $k + cosmos gpg --no-tty --import < $k elif [[ ${EXPIRED[$fp]} ]]; then echo -e "$0: ${bold}Re-importing expired key ${fp}${reset} from ${k}" - cosmos gpg --import < $k + cosmos gpg --no-tty --import < $k fi done