From d147f4a86feff649d4a74a0dee696a3213b35cc9 Mon Sep 17 00:00:00 2001 From: Ander Punnar Date: Fri, 20 Sep 2019 12:00:22 +0300 Subject: [PATCH] __apt_key: fix key dearmor when fetching from uri --- cdist/conf/type/__apt_key/gencode-remote | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/cdist/conf/type/__apt_key/gencode-remote b/cdist/conf/type/__apt_key/gencode-remote index 47c8bb49..e9daa524 100755 --- a/cdist/conf/type/__apt_key/gencode-remote +++ b/cdist/conf/type/__apt_key/gencode-remote @@ -48,11 +48,11 @@ curl -s -L \\ -o "$keyfile" \\ "$uri" -if grep -Fq 'BEGIN PGP PUBLIC KEY BLOCK' \\ - "$keyfile" +key="\$( cat "$keyfile" )" + +if echo "\$key" | grep -Fq 'BEGIN PGP PUBLIC KEY BLOCK' then - cat "$keyfile" \\ - | gpg --export > "$keyfile" + echo "\$key" | gpg --dearmor > "$keyfile" fi EOF