Compare commits
4
Commits
8715c20af2
...
quattro
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
e51542d347
|
||
|
|
640c0d4291
|
||
|
|
ed9ef8bc04
|
||
|
|
653656e439
|
@@ -2,7 +2,7 @@
|
||||
|
||||
面向中国开发者的 [Omarchy](https://omarchy.org) 下游发行版:完整保留 Omarchy 的 Arch + Hyprland 桌面体验,为中国网络环境、中文使用习惯与国内 AI 服务做系统级增强。
|
||||
|
||||
当前版本 `4.0.0.alpha-cn.7`(基于上游 `quattro` 分支构建的基线 ISO)。
|
||||
当前版本 `4.0.0.alpha-cn.8`(基于上游 `quattro` 分支构建的基线 ISO)。
|
||||
|
||||
## 特性
|
||||
|
||||
|
||||
@@ -78,14 +78,16 @@ check_omarchy_repo() {
|
||||
echo "INFO omarchy-repo: 非 stable 通道,跳过 OmarchyCN 镜像检查"
|
||||
return 0
|
||||
fi
|
||||
if cn_mirror_omarchy_repo_ok; then
|
||||
# --fix runs the helper even when the line is present: it also heals a missing key
|
||||
if [[ $fix == "true" ]]; then
|
||||
if cn_mirror_omarchy_repo_fix && cn_mirror_omarchy_repo_ok; then
|
||||
echo "PASS omarchy-repo: OmarchyCN 镜像行与 registry 公钥在位"
|
||||
return 0
|
||||
fi
|
||||
elif cn_mirror_omarchy_repo_ok; then
|
||||
echo "PASS omarchy-repo: OmarchyCN 镜像行在位"
|
||||
return 0
|
||||
fi
|
||||
if [[ $fix == "true" ]] && cn_mirror_omarchy_repo_fix && cn_mirror_omarchy_repo_ok; then
|
||||
echo "PASS omarchy-repo: 已重新插入 OmarchyCN 镜像行"
|
||||
return 0
|
||||
fi
|
||||
echo "FAIL omarchy-repo: [omarchy] 缺 OmarchyCN 镜像行(omarchycn doctor mirror --fix 可修复)"
|
||||
failures=$((failures + 1))
|
||||
}
|
||||
|
||||
@@ -14,6 +14,9 @@ cn_mirror_omarchy_repo_ok() {
|
||||
|
||||
cn_mirror_omarchy_repo_fix() {
|
||||
local conf="${OMARCHYCN_PACMAN_CONF:-/etc/pacman.conf}"
|
||||
# [omarchy] requires signed packages; the mirror re-signs with the registry key
|
||||
sudo pacman-key --add "$OMARCHY_PATH/cn/keys/omarchycn-registry.asc" > /dev/null || return 1
|
||||
sudo pacman-key --lsign-key 74DCF57ACD812B24D959F146BD386048867B33B4 > /dev/null || return 1
|
||||
cn_mirror_omarchy_repo_ok && return 0
|
||||
sudo sed -i "s|^Server = https://pkgs.omarchy.org/stable/|Server = $CN_OMARCHY_MIRROR\nServer = https://pkgs.omarchy.org/stable/|" "$conf"
|
||||
}
|
||||
|
||||
@@ -1,8 +1,5 @@
|
||||
echo "Trust the OmarchyCN registry key and put the [omarchy] mirror first"
|
||||
|
||||
sudo pacman-key --add "$OMARCHY_PATH/cn/keys/omarchycn-registry.asc"
|
||||
sudo pacman-key --lsign-key 74DCF57ACD812B24D959F146BD386048867B33B4
|
||||
|
||||
# Only the stable channel is mirrored; edge/rc systems keep upstream directly
|
||||
source "$OMARCHY_PATH/cn/lib/mirror.sh"
|
||||
cn_mirror_omarchy_repo_fix
|
||||
|
||||
+1
-1
@@ -1 +1 @@
|
||||
7
|
||||
8
|
||||
|
||||
+5
-5
@@ -25,7 +25,7 @@
|
||||
|
||||
<main>
|
||||
<section class="band hero" aria-labelledby="hero-title">
|
||||
<p class="eyebrow" style="grid-column: 1 / 13">OMARCHY CN · 4.0.0.alpha-cn.7</p>
|
||||
<p class="eyebrow" style="grid-column: 1 / 13">OMARCHY CN · 4.0.0.alpha-cn.8</p>
|
||||
<h1 id="hero-title" style="grid-column: 1 / 12">
|
||||
<span class="line">华丽、现代、观点鲜明</span><span class="line">的 Linux。中国版。</span>
|
||||
</h1>
|
||||
@@ -36,7 +36,7 @@
|
||||
<div class="actions" style="grid-column: 1 / 13">
|
||||
<a
|
||||
class="btn"
|
||||
href="https://dl.zacharyzhang.com/4.0.0.alpha-cn.7/omarchy-2026.08.29-x86_64-local.iso"
|
||||
href="https://dl.zacharyzhang.com/4.0.0.alpha-cn.8/omarchy-2026.08.29-x86_64-local.iso"
|
||||
>
|
||||
<span class="i" data-icon="Download" aria-hidden="true"></span>下载 ISO<span class="btn-meta">5.9 GB</span>
|
||||
</a>
|
||||
@@ -52,7 +52,7 @@
|
||||
</div>
|
||||
|
||||
<p class="meta mono" style="grid-column: 1 / 13">
|
||||
上游基线 basecamp/omarchy quattro · sha256 4c1cc4a2…60bcca · 转换可随时 omarchy cn revert 还原
|
||||
上游基线 basecamp/omarchy quattro · sha256 67c6bbf4…036b · 转换可随时 omarchy cn revert 还原
|
||||
</p>
|
||||
</section>
|
||||
|
||||
@@ -89,11 +89,11 @@
|
||||
<section class="band verify" aria-labelledby="verify-title">
|
||||
<h2 id="verify-title" style="grid-column: 1 / 4">校验</h2>
|
||||
<dl class="mono" style="grid-column: 4 / 13">
|
||||
<div><dt>sha256</dt><dd>4c1cc4a2726a28c6f2e548234be13381556bc2e9da9b7426d02c821bbd60bcca</dd></div>
|
||||
<div><dt>sha256</dt><dd>67c6bbf43266c7b383983d01318700117df19c147887944bde9c06d30c85036b</dd></div>
|
||||
<div><dt>签名子钥</dt><dd>PGP 211B9B82E17CFB67</dd></div>
|
||||
<div>
|
||||
<dt>清单</dt>
|
||||
<dd><a href="https://git.zacharyzhang.com/ZacharyZhang-NY/omarchycn/releases/download/4.0.0.alpha-cn.7/SHA256SUMS.txt">SHA256SUMS.txt</a> · <a href="https://git.zacharyzhang.com/ZacharyZhang-NY/omarchycn/releases/download/4.0.0.alpha-cn.7/SHA256SUMS.txt.asc">SHA256SUMS.txt.asc</a></dd>
|
||||
<dd><a href="https://git.zacharyzhang.com/ZacharyZhang-NY/omarchycn/releases/download/4.0.0.alpha-cn.8/SHA256SUMS.txt">SHA256SUMS.txt</a> · <a href="https://git.zacharyzhang.com/ZacharyZhang-NY/omarchycn/releases/download/4.0.0.alpha-cn.8/SHA256SUMS.txt.asc">SHA256SUMS.txt.asc</a></dd>
|
||||
</div>
|
||||
</dl>
|
||||
</section>
|
||||
|
||||
Reference in New Issue
Block a user