fix: 修复模块收敛性、异常处理和引导脚本健壮性

- dev: 异常捕获改为 except Exception 适配 decman 自定义异常
- docker/zsh/wsl: on_enable 改为 after_update + 状态检查确保收敛
- docker/zsh: subprocess 失败时 early return 避免误触发
- wsl: systemctl 调用加 try/except 防止 systemd 不可用时崩溃
- zsh: shell 路径改为精确解析 passwd 字段
- docker: decorator 别名统一为 pacman_packages
- install.sh: 开头验证 sudo 权限、mkdir -p 确保父目录、[ 改 [[
- wsl-init.sh: pacman -Sy 改 -Syu 避免 partial upgrade、已有用户补 wheel 组
This commit is contained in:
2026-03-26 20:41:54 +08:00
parent 769ca0a44b
commit 7d0ceb4e1c
6 changed files with 65 additions and 16 deletions
+12 -2
View File
@@ -1,3 +1,5 @@
import subprocess
import decman
from decman import File, Module
from decman.plugins.aur import packages as aur_packages
@@ -38,5 +40,13 @@ class ZshModule(Module):
"oh-my-zsh-git",
}
def on_enable(self, store):
decman.prg(["chsh", "-s", "/usr/bin/zsh", self.user])
def after_update(self, store):
result = subprocess.run(
["getent", "passwd", self.user], capture_output=True, text=True
)
if result.returncode != 0:
return
# passwd 格式: name:x:uid:gid:gecos:home:shell
shell = result.stdout.strip().split(":")[-1]
if shell != "/usr/bin/zsh":
decman.prg(["chsh", "-s", "/usr/bin/zsh", self.user])