From 153cf40d3ec7f809a4542c4de4a65a3cafd689e5 Mon Sep 17 00:00:00 2001
From: SherkeyXD <253294679@qq.com>
Date: Mon, 11 Jul 2022 21:18:28 +0800
Subject: [PATCH] help: adoptium: follow upstream doc
help: adoptium: fix url
---
help/_posts/1970-01-01-adoptium.md | 50 +++++++++---------------------
1 file changed, 15 insertions(+), 35 deletions(-)
diff --git a/help/_posts/1970-01-01-adoptium.md b/help/_posts/1970-01-01-adoptium.md
index 912f4b1..a8d4020 100644
--- a/help/_posts/1970-01-01-adoptium.md
+++ b/help/_posts/1970-01-01-adoptium.md
@@ -12,64 +12,44 @@ mirrorid: Adoptium
### Debian/Ubuntu 用户
-首先信任 GPG 公钥:
-
+首先请安装依赖:
```
-wget -qO - https://packages.adoptium.net/artifactory/api/gpg/key/public | apt-key add -
+apt-get update && apt-get install -y wget apt-transport-https
```
-再选择你的 Debian/Ubuntu 版本，文本框中内容写进 `/etc/apt/sources.list.d/Adoptium.list`
+然后信任 GPG 公钥:
+```
+wget -O - https://packages.adoptium.net/artifactory/api/gpg/key/public | sudo tee /etc/apt/keyrings/adoptium.asc
+```
-
-
-
-
-
-
-
+随后执行以下命令来添加 apt 存储库:
+```
+echo "deb [signed-by=/etc/apt/keyrings/adoptium.asc] https://{{ site.hostname }}/Adoptium/deb $(awk -F= '/^VERSION_CODENAME/{print$2}' /etc/os-release) main" | sudo tee /etc/apt/sources.list.d/adoptium.list
+```
再执行
-
```
sudo apt-get update
```
之后可以使用 `sudo apt-get install temurin--jdk` 安装软件包，例如 `temurin-17-jdk` 和 `temurin-8-jdk`。
-{% raw %}
-
-{%endraw%}
-
-### CentOS/RHEL
-
-新建 `/etc/yum.repos.d/Adoptium.repo`，内容为
+### CentOS/RHEL/Fedora
+执行以下命令来添加 rpm 存储库:
```
+cat < /etc/yum.repos.d/adoptium.repo
[Adoptium]
name=Adoptium
-baseurl=https://{{ site.hostname }}/Adoptium/rpm/centos$releasever-$basearch/
+baseurl=https://{{ site.hostname }}/Adoptium/rpm/${DISTRIBUTION_NAME:-$(. /etc/os-release; echo $ID)}/\$releasever/\$basearch
enabled=1
gpgcheck=1
gpgkey=https://packages.adoptium.net/artifactory/api/gpg/key/public
+EOF
```
再执行
-
```
sudo yum makecache
```