Merge branch 'fix_apt_key_dearmor' into 'master'

__apt_key: fix key dearmor when fetching from uri

See merge request ungleich-public/cdist!791
This commit is contained in:
poljakowski 2019-10-01 07:00:33 +02:00
commit f86768ab16
1 changed files with 4 additions and 4 deletions

View File

@ -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