bazel-apt,erlang-solutions,gitlab*,influxdata: Unify gpg dearmor

mirrorz-org/mirrorz-help@64a2941
mirrorz-org · Jan 20, 2025 · 0788ab3 · 0788ab3
1 parent 6f2dc61
commit 0788ab3
Show file tree

Hide file tree

Showing 5 changed files with 5 additions and 6 deletions.
diff --git a/bazel-apt/usage.zh.md b/bazel-apt/usage.zh.md
@@ -4,8 +4,7 @@
 
 <tmpl z-lang="bash">
 {{sudo}}apt install apt-transport-https curl gnupg
-curl -fsSL https://bazel.build/bazel-release.pub.gpg | gpg --dearmor >bazel-archive-keyring.gpg
-{{sudo}}mv bazel-archive-keyring.gpg /usr/share/keyrings
+curl -fsSL https://bazel.build/bazel-release.pub.gpg | {{sudo}}gpg --dearmor -o /usr/share/keyrings/bazel-archive-keyring.gpg
 echo "deb [arch=amd64 signed-by=/usr/share/keyrings/bazel-archive-keyring.gpg] {{endpoint}} stable jdk1.8" | {{sudo}}tee /etc/apt/sources.list.d/bazel.list
 </tmpl>
 

diff --git a/erlang-solutions/deb.zh.md b/erlang-solutions/deb.zh.md
@@ -23,7 +23,7 @@ Elixir 版本：
 
 <tmpl z-lang="bash">
 {{sudo}}mkdir -m 0755 -p /etc/apt/keyrings/
-curl -s https://binaries2.erlang-solutions.com/GPG-KEY-pmanager.asc | gpg --dearmor | {{sudo}}tee /etc/apt/keyrings/erlang-solutions-archive_compat.gpg > /dev/null
+curl -s https://binaries2.erlang-solutions.com/GPG-KEY-pmanager.asc | {{sudo}}gpg --dearmor -o /etc/apt/keyrings/erlang-solutions-archive_compat.gpg
 </tmpl>
 
 新建 `/etc/apt/sources.list.d/erlang-solutions.list`，填入下列内容（可根据需要选择）：

diff --git a/gitlab-ce/deb.zh.md b/gitlab-ce/deb.zh.md
@@ -3,7 +3,7 @@
 首先信任 GitLab 的 GPG 公钥：
 
 <tmpl z-lang="bash">
-curl -fsSL https://packages.gitlab.com/gpg.key | {{sudo}}gpg --dearmor > /usr/share/keyrings/gitlab_gitlab-ce-archive-keyring.gpg
+curl -fsSL https://packages.gitlab.com/gpg.key | {{sudo}}gpg --dearmor -o /usr/share/keyrings/gitlab_gitlab-ce-archive-keyring.gpg
 </tmpl>
 
 再选择你的 Debian/Ubuntu 版本，将下方内容写入 `/etc/apt/sources.list.d/gitlab-ce.list`

diff --git a/gitlab-runner/deb.zh.md b/gitlab-runner/deb.zh.md
@@ -3,7 +3,7 @@
 首先下载 GitLab 的 GPG 公钥：
 
 <tmpl z-lang="bash">
-curl -L https://packages.gitlab.com/runner/gitlab-runner/gpgkey | gpg --dearmor > /usr/share/keyrings/gitlab-runner.gpg
+curl -L https://packages.gitlab.com/runner/gitlab-runner/gpgkey | {{sudo}}gpg --dearmor -o /usr/share/keyrings/gitlab-runner.gpg
 </tmpl>
 
 再选择你的 Debian/Ubuntu 版本，将下方内容写入 `/etc/apt/sources.list.d/gitlab-runner.list`

diff --git a/influxdata/influxdata.zh.md b/influxdata/influxdata.zh.md
@@ -8,7 +8,7 @@ _注：Influxdata 在 2023-01-26 使用了新的 GPG 密钥，详情可参考[
 
 <tmpl z-lang="bash">
 wget -q https://repos.influxdata.com/influxdata-archive_compat.key
-cat influxdata-archive_compat.key | gpg --dearmor | {{sudo}}tee /etc/apt/trusted.gpg.d/influxdata-archive_compat.gpg > /dev/null
+cat influxdata-archive_compat.key | {{sudo}}gpg --dearmor -o /etc/apt/trusted.gpg.d/influxdata-archive_compat.gpg
 </tmpl>
 
 将下方文本框中的内容写入 `/etc/apt/sources.list.d/influxdata.list`