refactor(modules): 添加类型注解并优化 WSL 检测
- 全模块补全类型注解 (files, after_update, on_change) - docker: 仅在 WSL 环境禁用 networkd-wait-online - docker: 添加 _is_wsl() 自动检测函数 - zsh/docker: 改进错误输出使用 decman.error - wsl-init: 统一使用 [[ ]] 并格式化代码
This commit is contained in:
+7
-3
@@ -11,7 +11,7 @@ class ZshModule(Module):
|
||||
super().__init__("zsh")
|
||||
self.user = user
|
||||
|
||||
def files(self):
|
||||
def files(self) -> dict[str, File]:
|
||||
return {
|
||||
f"/home/{self.user}/.zshrc": File(
|
||||
source_file="./home/.zshrc",
|
||||
@@ -35,11 +35,15 @@ class ZshModule(Module):
|
||||
"fzf-tab-git",
|
||||
}
|
||||
|
||||
def after_update(self, store):
|
||||
def after_update(self, store: object) -> None:
|
||||
result = subprocess.run(
|
||||
["getent", "passwd", self.user], capture_output=True, text=True
|
||||
["getent", "passwd", self.user],
|
||||
capture_output=True,
|
||||
text=True,
|
||||
check=False,
|
||||
)
|
||||
if result.returncode != 0:
|
||||
decman.error(f"无法读取用户 {self.user} 的 passwd 信息")
|
||||
return
|
||||
# passwd 格式: name:x:uid:gid:gecos:home:shell
|
||||
shell = result.stdout.strip().split(":")[-1]
|
||||
|
||||
Reference in New Issue
Block a user