Merge branch 'fix_apt_key_dearmor' into 'master'

__apt_key: fix key dearmor when fetching from uri

See merge request ungleich-public/cdist!791
remotes/origin/feature/shell-lib
Darko Poljak 6 years ago
commit f86768ab16
  1. 8
      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

Loading…
Cancel
Save