Skip to content

emrg: build-release 二十一次修复 — smoke Windows daemon HOME 同步 + 启动诊断（rant #13）#389

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
argszero merged 1 commit into from
Aug 4, 2026
Merged

emrg: build-release 二十一次修复 — smoke Windows daemon HOME 同步 + 启动诊断（rant #13） #389

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
21 changes: 17 additions & 4 deletions packaging/smoke-test.sh
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -21,6 +21,14 @@ smoke_home="$(mktemp -d)"
trap 'rm -rf "$smoke_home"' EXIT
export HOME="$smoke_home"
mkdir -p "$HOME/.emrg"
# R114: Windows 下经 cmd 启动的原生 python.exe 不认 Git Bash 的 $HOME —
# Path.home() 读 USERPROFILE/HOMEDRIVE/HOMEPATH。隔离 HOME 冒烟必须同步这三个
# 变量，否则 daemon 会把 config/port 写到真实用户目录（config 缺失 → 崩溃不写 port）。
if [ -n "${WINDIR:-}" ]; then
export USERPROFILE="$(cygpath -w "$HOME")"
export HOMEDRIVE="${USERPROFILE:0:2}"
export HOMEPATH="${USERPROFILE:2}"
fi

say() { printf '\n==> %s\n' "$*"; }
ok() { PASS=$((PASS+1)); printf ' ✓ %s\n' "$*"; }
Expand DownExpand Up@@ -51,18 +59,23 @@ model = "deepseek-chat"
EOF
# R101：Windows Git Bash 的 nohup 后台 bash 脚本会立即退出（无 POSIX 进程模型）
# → 用 cmd //c start /b emrgd.cmd 后台启动；POSIX 保持 nohup emrgd
# R114：输出保留到 emrgd-debug.log（不丢 /dev/null），daemon 启动失败时可诊断。
if [ -n "${WINDIR:-}" ]; then
# $HOME 在 Git Bash 是 POSIX 路径（/c/Users/...），cmd 需 Windows 路径（C:\Users\...）→ cygpath -m
EMRGD_CMD="$(cygpath -m "$HOME/.emrg/install/bin/emrgd.cmd")"
(cd "$HOME" && cmd //c "start /b $EMRGD_CMD" >/dev/null 2>&1)
(cd "$HOME" && cmd //c "start /b $EMRGD_CMD" >"$HOME/.emrg/emrgd-debug.log" 2>&1)
else
nohup emrgd >/dev/null 2>&1 &
nohup emrgd >"$HOME/.emrg/emrgd-debug.log" 2>&1 &
fi
for i in $(seq 1 30); do
[ -f "$HOME/.emrg/emrgd.port" ] && break
sleep 0.5
done
if [ ! -f "$HOME/.emrg/emrgd.port" ]; then
echo " [debug] emrgd-debug.log:" >&2
cat "$HOME/.emrg/emrgd-debug.log" 2>/dev/null || true
echo " [debug] emrgd.log (tail):" >&2
tail -20 "$HOME/.emrg/emrgd.log" 2>/dev/null || true
fail "daemon did not write port file"
else
port=$(head -1 "$HOME/.emrg/emrgd.port")
Expand DownExpand Up@@ -116,9 +129,9 @@ say "5. emrg rant"
if [ -n "${WINDIR:-}" ]; then
# $HOME 在 Git Bash 是 POSIX 路径（/c/Users/...），cmd 需 Windows 路径（C:\Users\...）→ cygpath -m
EMRGD_CMD="$(cygpath -m "$HOME/.emrg/install/bin/emrgd.cmd")"
(cd "$HOME" && cmd //c "start /b $EMRGD_CMD" >/dev/null 2>&1)
(cd "$HOME" && cmd //c "start /b $EMRGD_CMD" >"$HOME/.emrg/emrgd-debug2.log" 2>&1)
else
nohup emrgd >/dev/null 2>&1 &
nohup emrgd >"$HOME/.emrg/emrgd-debug2.log" 2>&1 &
fi
sleep 1
if emrg rant "smoke-test" 2>&1 | grep -qi "daemon not running"; then
Expand Down
Loading