Skip to content

Linux 支持（Ubuntu 26.04 实测）——install.py find_asar 增加 /opt/ZCode、/usr/li… #3

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
xhwxt merged 1 commit into from
Sep 10, 2026
Merged

Linux 支持（Ubuntu 26.04 实测）——install.py find_asar 增加 /opt/ZCode、/usr/li… #3

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
98 changes: 92 additions & 6 deletions install.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,8 @@
overlay 副本刷新后由泵 2 秒内热重载；改了 inject-main.cjs（泵）才需要重启 ZCode。

ZCode 安装位置自动探测：环境变量 ZCODE_ASAR → 当前平台常见安装位置下找 resources\\app.asar
（Windows：D:\\ZCode 等；macOS：/Applications、~/Applications 下的 ZCode.app）；
（Windows：D:\\ZCode 等；macOS：/Applications、~/Applications 下的 ZCode.app；
Linux：/opt/ZCode、/usr/lib/zcode 等 deb/rpm 布局）；
失败且终端可交互时询问，或用 --asar 指定。非默认位置首次安装成功后路径记住在 config.json
（asar_path 字段），之后的安装/卸载一律免传 --asar。
"""
Expand All @@ -34,9 +35,36 @@
from pathlib import Path

HERE = Path(__file__).parent.resolve()
DATA_DIR = Path.home() / ".zcode" / "zcode-token-usage-statusbar" # 标准安装的数据/运行目录
ZCODE_CONFIG = Path.home() / ".zcode" / "cli" / "config.json"
COMMANDS_DIR = Path.home() / ".zcode" / "commands"


def _sudo_user():
"""sudo 运行时的真实用户名（POSIX；非 sudo / Windows 返回 None）。"""
if sys.platform != "win32" and os.environ.get("SUDO_USER"):
try:
if os.geteuid() == 0:
return os.environ["SUDO_USER"]
except AttributeError:
pass
return None


def real_home():
"""真实用户家目录：sudo 运行时 Path.home() 是 root 的家，而数据目录/MCP 注册/
/usage 命令必须落在真实用户的 ~/.zcode（ZCode 客户端与泵都以普通用户身份运行）。
Linux 上 /opt 等系统安装位置写入需要 root，这是本函数存在的唯一场景。"""
sudo_user = _sudo_user()
if sudo_user:
try:
import pwd
return Path(pwd.getpwnam(sudo_user).pw_dir)
except (KeyError, OSError):
pass
return Path.home()


DATA_DIR = real_home() / ".zcode" / "zcode-token-usage-statusbar" # 标准安装的数据/运行目录
ZCODE_CONFIG = real_home() / ".zcode" / "cli" / "config.json"
COMMANDS_DIR = real_home() / ".zcode" / "commands"
MCP_NAME = "zcode-token-usage-statusbar" # MCP server 注册名（与仓库名一致；老安装叫 token-usage/zusage，自动迁移）
MCP_NAME_OLD = ("token-usage", "zusage") # 历史注册名
RUNTIME_FILES = ("inject-main.cjs", "overlay.js", "zusage.py", "usage_mcp.py")
Expand All @@ -47,6 +75,13 @@
"/Applications/ZCode.app/Contents/Resources/app.asar",
"~/Applications/ZCode.app/Contents/Resources/app.asar",
]
elif sys.platform.startswith("linux"):
ASAR_CANDIDATES = [
"/opt/ZCode/resources/app.asar", # deb/rpm 官方包默认布局（<root>/zcode）
"/opt/zcode/resources/app.asar",
"/usr/lib/zcode/resources/app.asar",
"/usr/local/ZCode/resources/app.asar",
]
else:
ASAR_CANDIDATES = [
r"D:\ZCode\resources\app.asar",
Expand Down Expand Up @@ -96,6 +131,22 @@ def find_asar():
p = ch / "resources" / "app.asar"
if p.is_file():
return p
elif sys.platform.startswith("linux"):
# 兜底：扫 /opt、/usr/lib、/usr/local/lib 一层子目录，目录名含 zcode 即命中
for base in ("/opt", "/usr/lib", "/usr/local/lib"):
b = Path(base)
if not b.is_dir():
continue
try:
children = sorted(b.iterdir())
except OSError:
continue
for ch in children:
if "zcode" not in ch.name.lower():
continue
p = ch / "resources" / "app.asar"
if p.is_file():
return p
return None


Expand Down Expand Up @@ -141,6 +192,20 @@ def remember_asar(asar, dev):
print(L(f"[目标] 已记住安装位置 → {cfg}", f"[target] install location remembered -> {cfg}"))


def chown_to_user(path):
"""sudo 运行时把产物归还给真实用户（数据目录、config、注册文件）；
asar 属系统安装（root 所有），保持原属主不动。非 sudo 是 no-op。"""
sudo_user = _sudo_user()
if not sudo_user:
return
try:
import pwd
st = pwd.getpwnam(sudo_user)
os.chown(path, st.pw_uid, st.pw_gid)
except (KeyError, OSError, AttributeError):
Comment on lines +195 to +205
pass


def copy_runtime(dry):
"""复制运行时四件套到数据目录（无条件覆盖：overlay 的 mtime 变化会让泵 2 秒内热重载）。"""
for name in RUNTIME_FILES:
Expand All @@ -150,8 +215,10 @@ def copy_runtime(dry):
f"[runtime] copying {len(RUNTIME_FILES)} files -> {DATA_DIR}"))
if not dry:
DATA_DIR.mkdir(parents=True, exist_ok=True)
chown_to_user(DATA_DIR)
for name in RUNTIME_FILES:
shutil.copy2(HERE / name, DATA_DIR / name)
chown_to_user(DATA_DIR / name)
return True


Expand Down Expand Up @@ -192,7 +259,9 @@ def prepare_config(dry, dev):
f"[config] generating {cfg} (python_path = {sys.executable})"))
if not dry:
cfg.parent.mkdir(parents=True, exist_ok=True)
chown_to_user(cfg.parent)
cfg.write_text(json.dumps(vals, indent=2, ensure_ascii=False), encoding="utf-8")
chown_to_user(cfg)
return True


Expand Down Expand Up @@ -223,9 +292,11 @@ def register_mcp(dry, dev):
print(L(f"[MCP] 注册 {MCP_NAME} → {usage_mcp}", f"[mcp] registering {MCP_NAME} -> {usage_mcp}") + removed_note)
if not dry:
ZCODE_CONFIG.parent.mkdir(parents=True, exist_ok=True)
chown_to_user(ZCODE_CONFIG.parent)
if ZCODE_CONFIG.is_file():
shutil.copy2(ZCODE_CONFIG, ZCODE_CONFIG.with_suffix(".json.zusage.bak"))
ZCODE_CONFIG.write_text(json.dumps(data, indent=2, ensure_ascii=False), encoding="utf-8")
chown_to_user(ZCODE_CONFIG)
return True


Expand Down Expand Up @@ -332,12 +403,27 @@ def main():

asar = Path(args.asar) if args.asar else (find_asar() or ask_asar())
if not asar or not asar.is_file():
example = (r"E:\Apps\ZCode\resources\app.asar" if sys.platform == "win32"
else "/Applications/ZCode.app/Contents/Resources/app.asar")
if sys.platform == "win32":
example = r"E:\Apps\ZCode\resources\app.asar"
elif sys.platform.startswith("linux"):
example = "/opt/ZCode/resources/app.asar"
else:
example = "/Applications/ZCode.app/Contents/Resources/app.asar"
print(L(f"找不到 app.asar。用 --asar 指定，例如：python install.py --asar {example}",
f"app.asar not found. Specify it with --asar, e.g.: python install.py --asar {example}"))
return 1
print(L(f"[目标] {asar}", f"[target] {asar}"))
if (sys.platform != "win32" and os.geteuid() != 0
and not os.access(asar, os.W_OK)):
hint = " ".join(sys.argv[1:])
Comment on lines +416 to +418
print(L(f"[权限] {asar.parent} 不可写（系统级安装位置，Linux 上常见），需要 sudo：",
f"[permission] {asar.parent} is not writable (a system-level install location, common on Linux); sudo is required:"))
print(L(f" sudo {Path(sys.executable).name} {Path(__file__).name} {hint}".rstrip(),
f" sudo {Path(sys.executable).name} {Path(__file__).name} {hint}".rstrip()))
print(L("（数据目录/MCP 注册会自动落到你的用户家目录，产物归属普通用户；asar 本身保持 root 属主）",
"(the data dir / MCP registration go to your real user home with user ownership; the asar keeps its root ownership)"))
if not args.dry_run:
return 1
if not args.dry_run:
pi.set_target(asar)
if not args.dev:
Expand Down
3 changes: 3 additions & 0 deletions install_monitor.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,8 +25,11 @@

HERE = Path(__file__).parent.resolve()
IS_MAC = sys.platform == "darwin"
IS_LINUX = sys.platform.startswith("linux")
# 缺省仅兜底（patch_install.py 拉起时必传 argv[2]）：按平台取常见安装位置
ASAR = Path(sys.argv[2]) if len(sys.argv) > 2 else (
Path("/Applications/ZCode.app/Contents/Resources/app.asar") if IS_MAC
else Path("/opt/ZCode/resources/app.asar") if IS_LINUX
else Path(r"D:\ZCode\resources\app.asar"))
RUNTIME_DIR = Path(sys.argv[3]) if len(sys.argv) > 3 else HERE
TMP = ASAR.with_name("app.asar.zusage.tmp")
Expand Down
28 changes: 26 additions & 2 deletions patch_install.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -75,7 +75,20 @@ def L(zh, en):
global _LANG
if _LANG is None:
_LANG = "zh"
for base in (RUNTIME, Path.home() / ".zcode" / "zcode-token-usage-statusbar"):
# sudo 运行时（Linux 系统级安装）config 在真实用户的家目录，Path.home() 会指到 root
sudo_home = None
if sys.platform != "win32" and os.environ.get("SUDO_USER"):
try:
if os.geteuid() == 0:
import pwd
sudo_home = Path(pwd.getpwnam(os.environ["SUDO_USER"]).pw_dir)
except (KeyError, OSError, AttributeError):
pass
bases = [RUNTIME,
Path.home() / ".zcode" / "zcode-token-usage-statusbar"]
if sudo_home:
bases.append(sudo_home / ".zcode" / "zcode-token-usage-statusbar")
for base in bases:
try:
lang = json.loads((base / "config.json").read_text(encoding="utf-8")).get("lang")
if lang in ("zh", "en"):
Expand All @@ -97,12 +110,15 @@ def set_runtime(path):

def zcode_exe_for(asar_path):
"""从 asar 位置推 ZCode 可执行文件（仅语法自检用）：Windows 布局 <root>/ZCode.exe，
macOS bundle 布局 <root>/MacOS/ZCode；其它平台返回 None（语法检查自动跳过）。"""
macOS bundle 布局 <root>/MacOS/ZCode，Linux 布局 <root>/zcode（deb/rpm 官方包，/opt/ZCode）；
其它平台返回 None（语法检查自动跳过）。"""
root = asar_path.parent.parent
if IS_WIN:
return root / "ZCode.exe"
if IS_MAC:
return root / "MacOS" / "ZCode"
if sys.platform.startswith("linux"):
return root / "zcode"
return None


Expand Down Expand Up @@ -285,6 +301,14 @@ def cleanup_legacy_bak():
def install(finalize=False):
"""返回 True=已安装/已指向当前目录，False=失败或待收尾。"""
assert LOADER.exists(), L(f"loader 缺失：{LOADER}", f"loader missing: {LOADER}")
if not os.access(ASAR, os.W_OK) or not os.access(ASAR.parent, os.W_OK):
print(L(f"[权限] app.asar 或所在目录不可写（Linux 上 /opt 等系统位置需要 root）：{ASAR}",
f"[permission] app.asar or its directory is not writable (Linux system locations like /opt need root): {ASAR}"))
print(L("请用 sudo 重跑（推荐走一键安装，会自动处理目标定位与数据目录归属）：",
"Please re-run with sudo (the one-shot installer is recommended; it resolves the target and data-dir ownership automatically):"))
print(L(" sudo python install.py # 自动探测（含 /opt/ZCode）",
" sudo python install.py # auto-detects (including /opt/ZCode)"))
return False
Comment on lines 303 to +311
entry = entry_bytes_of(ASAR)
stripped = ZUSAGE_LINE_RE.sub(b"", entry) # 剥离任何旧注入行（含指向旧目录的）
if stripped + INJECT_LINE.encode() == entry:
Expand Down