From 5bab9b81ac9ae2fb94e79a01351b3f222de35a99 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=9B=B7=E7=94=B5=E8=8A=BD=E8=A1=A3?= Date: Mon, 24 Aug 2026 20:01:53 -0400 Subject: [PATCH] Overlay: comments-only extension template counts as replaceable Co-Authored-By: Claude Fable 5 Claude-Session: https://claude.ai/code/session_01QKxGW1raAWaqeU8WdHsMsp --- bin/omarchy-cn-install-overlay | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/bin/omarchy-cn-install-overlay b/bin/omarchy-cn-install-overlay index 769ea632..18eb62ec 100755 --- a/bin/omarchy-cn-install-overlay +++ b/bin/omarchy-cn-install-overlay @@ -27,8 +27,15 @@ valid_entry() { MENU_EXT="$HOME/.config/omarchy/extensions/omarchy-menu.jsonc" MENU_MARKER="// OmarchyCN overlay menu extension" +# Comments-only files (upstream ships such a template) hold no user content +menu_ext_has_user_content() { + [[ -f $MENU_EXT ]] || return 1 + grep -qF "$MENU_MARKER" "$MENU_EXT" && return 1 + [[ -n $(grep -vE '^[[:space:]]*(//.*)?$' "$MENU_EXT" | tr -d '[:space:]{}') ]] +} + install_menu_extension() { - if [[ -s $MENU_EXT ]] && ! grep -qF "$MENU_MARKER" "$MENU_EXT"; then + if menu_ext_has_user_content; then echo "跳过菜单扩展：$MENU_EXT 已有用户内容，请手动合并 default/omarchy/omarchy-menu.jsonc 的 OmarchyCN 段" return 0 fi