ZacharyZhang-NY/omarchycn
3
4
Fork 0
Code Issues Pull Requests 2 Actions Packages Projects Releases 5 Wiki Activity

Propagate key-trust failures and let doctor --fix heal a keyless mirror line

Browse Source 
Co-Authored-By: Claude Fable 5 <noreply@anthropic.com>
Claude-Session: https://claude.ai/code/session_01Kb7vDj6PHwymeDeSUUk1eX
This commit is contained in:
ZacharyZhang-NY
2026-08-28 23:35:24 -04:00
co-authored by Claude Fable 5
parent 653656e439
commit ed9ef8bc04
2 changed files with 9 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
bin/omarchy-cn-doctor
+7 -5
View File
@@ -78,14 +78,16 @@ check_omarchy_repo() {
echo "INFO omarchy-repo: 非 stable 通道，跳过 OmarchyCN 镜像检查" echo "INFO omarchy-repo: 非 stable 通道，跳过 OmarchyCN 镜像检查"
return 0 return 0
fi 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 镜像行在位" echo "PASS omarchy-repo: OmarchyCN 镜像行在位"
return 0 return 0
fi 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 可修复）" echo "FAIL omarchy-repo: [omarchy] 缺 OmarchyCN 镜像行（omarchycn doctor mirror --fix 可修复）"
failures=$((failures + 1)) failures=$((failures + 1))
} }
cn/lib/mirror.sh
+2 -2
View File
@@ -15,8 +15,8 @@ cn_mirror_omarchy_repo_ok() {
cn_mirror_omarchy_repo_fix() { cn_mirror_omarchy_repo_fix() {
local conf="${OMARCHYCN_PACMAN_CONF:-/etc/pacman.conf}" local conf="${OMARCHYCN_PACMAN_CONF:-/etc/pacman.conf}"
# [omarchy] requires signed packages; the mirror re-signs with the registry key # [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 sudo pacman-key --add "$OMARCHY_PATH/cn/keys/omarchycn-registry.asc" > /dev/null || return 1
sudo pacman-key --lsign-key 74DCF57ACD812B24D959F146BD386048867B33B4 > /dev/null sudo pacman-key --lsign-key 74DCF57ACD812B24D959F146BD386048867B33B4 > /dev/null || return 1
cn_mirror_omarchy_repo_ok && return 0 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" sudo sed -i "s|^Server = https://pkgs.omarchy.org/stable/|Server = $CN_OMARCHY_MIRROR\nServer = https://pkgs.omarchy.org/stable/|" "$conf"
} }