Files
ipass__ipass/deploy/migrate-agent-home.sh
T
admin 354c58e721 fix(migrate-agent-home): 放宽 git 依赖,没 git 也能跑
脚本原硬要求 REPO_DIR 是 git repo,否则直接 exit。但 .11 上没装 git
的部署场景只 scp deploy/ 文件夹上来跑,git pull 那步根本不存在。

改成:
  * 必须有 $REPO_DIR/deploy/ipass-agent.py 文件(不强制 .git)
  * 如果 command -v git && [ -d .git ] 才尝试 pull,否则跳过
  * 缺文件时给 scp 提示(之前的错误信息只说"仓库不存在",新用户看不懂)
2026-09-16 11:43:47 +08:00

137 lines
5.1 KiB
Bash
Executable File
Raw Permalink Blame History

This file contains ambiguous Unicode characters
This file contains Unicode characters that might be confused with other characters. If you think that this is intentional, you can safely ignore this warning. Use the Escape button to reveal them.
#!/usr/bin/env bash
# =============================================================================
# 把散在 $HOME 根目录的 agent 三件套(py/log/pid + token)统一迁移到 ~/ipass/
#
# 仅做一次:commit 已把 ipass-agent.py 硬编码路径切到 ~/ipass/,之后
# git pull + restart 即可,不需要再跑本脚本。
#
# 用法(在 .11 上、用跑控制面的那个账号):
# bash deploy/migrate-agent-home.sh
#
# 可覆盖:
# REPO_DIR=/path/to/repo 默认 $HOME/ipass
# AGENT_PORT=18099 默认 18099
# =============================================================================
set -euo pipefail
REPO_DIR="${REPO_DIR:-$HOME/ipass}"
OLD_PREFIX="$HOME"
NEW_PREFIX="$HOME/ipass"
AGENT_PORT="${AGENT_PORT:-18099}"
c_ok() { printf '\033[32m✓\033[0m %s\n' "$*"; }
c_warn() { printf '\033[33m!\033[0m %s\n' "$*"; }
c_err() { printf '\033[31m✗\033[0m %s\n' "$*" >&2; }
step() { printf '\n\033[36m==> %s\033[0m\n' "$*"; }
# ---------------------------------------------------------------- 1. 定位新 agent 代码
# git 可选:装了 git 且是 repo 就 pull;否则只要文件在就行
[ -f "$REPO_DIR/deploy/ipass-agent.py" ] || {
c_err "找不到 $REPO_DIR/deploy/ipass-agent.py"
c_err " → scp 本仓库 deploy/ 到 $REPO_DIR/ 后再跑"
c_err " → 或者设 REPO_DIR 指到 deploy/ 的父目录"
exit 1
}
NEW_SHA=""
if command -v git >/dev/null 2>&1 && [ -d "$REPO_DIR/.git" ]; then
(cd "$REPO_DIR" && git pull --ff-only) 2>/dev/null \
|| c_warn "git pull 失败(继续,可能无新提交或网络问题)"
NEW_SHA=$(git -C "$REPO_DIR" rev-parse --short HEAD 2>/dev/null || echo "")
fi
step "agent 代码:$REPO_DIR/deploy/ipass-agent.py${NEW_SHA:+(git $NEW_SHA)}"
# ---------------------------------------------------------------- 2. 优雅停旧 agent
step "停止旧 agent"
if [ -f "$OLD_PREFIX/ipass-agent.pid" ]; then
PID=$(cat "$OLD_PREFIX/ipass-agent.pid")
if kill -0 "$PID" 2>/dev/null; then
kill "$PID" 2>/dev/null && c_ok "已发 SIGTERM 给 pid $PID"
for _ in $(seq 1 10); do
sleep 1
kill -0 "$PID" 2>/dev/null || break
done
if kill -0 "$PID" 2>/dev/null; then
kill -9 "$PID" 2>/dev/null || true
c_warn "已 SIGKILL pid $PID"
fi
else
c_warn "pidfile 存在但进程 $PID 已死"
fi
rm -f "$OLD_PREFIX/ipass-agent.pid"
else
c_warn "旧 pidfile 不存在(agent 可能没在跑)"
fi
# ---------------------------------------------------------------- 3. 准备 ~/ipass/
step "迁移文件 → $NEW_PREFIX/"
mkdir -p "$NEW_PREFIX"
chmod 700 "$NEW_PREFIX" 2>/dev/null || true
# 3a. agent 代码:cp 仓库版本(最新,含新路径常量)
cp -v "$REPO_DIR/deploy/ipass-agent.py" "$NEW_PREFIX/ipass-agent.py"
chmod +x "$NEW_PREFIX/ipass-agent.py"
# 3b. 删旧位置残留(如果旧代码已经 cp 到新位置后还留着,会有人误跑去跑它)
rm -f "$OLD_PREFIX/ipass-agent.py"
# 3c. token
if [ -f "$OLD_PREFIX/.ipass-agent-token" ]; then
if [ ! -f "$NEW_PREFIX/.ipass-agent-token" ]; then
mv "$OLD_PREFIX/.ipass-agent-token" "$NEW_PREFIX/.ipass-agent-token"
chmod 600 "$NEW_PREFIX/.ipass-agent-token"
c_ok "token 已迁移"
else
# 两边都有:保留新的(可能 agent 重生成过),旧的归档
mv "$OLD_PREFIX/.ipass-agent-token" "$NEW_PREFIX/.ipass-agent-token.bak"
c_warn "新位置已有 token;旧 token 归档为 .bak"
fi
else
c_warn "旧 token 不存在(agent 启动时会自动生成新的)"
fi
# 3d. 日志(保留作排查线索,gzip 后归档)
if [ -f "$OLD_PREFIX/ipass-agent.log" ] && [ -s "$OLD_PREFIX/ipass-agent.log" ]; then
if gzip -c "$OLD_PREFIX/ipass-agent.log" > "$NEW_PREFIX/ipass-agent.log.old.gz"; then
c_ok "旧日志归档 → $NEW_PREFIX/ipass-agent.log.old.gz"
else
c_warn "日志归档失败(继续)"
fi
fi
rm -f "$OLD_PREFIX/ipass-agent.log"
# 3e. pidfile(步骤 2 已删,兜底)
rm -f "$OLD_PREFIX/ipass-agent.pid"
# ---------------------------------------------------------------- 4. 启动新 agent
step "启动新 agent(cd ~/ipass && nohup python3 ./ipass-agent.py --bg)"
cd "$NEW_PREFIX"
nohup python3 ./ipass-agent.py --bg >/dev/null 2>&1 &
sleep 2
# ---------------------------------------------------------------- 5. 健康检查
if ! curl -fsS "http://127.0.0.1:$AGENT_PORT/health" >/dev/null 2>&1; then
c_err "agent 没起来,看 $NEW_PREFIX/ipass-agent.log"
exit 1
fi
c_ok "agent 已就绪(端口 $AGENT_PORT)"
# ---------------------------------------------------------------- 6. 报告
echo
step "迁移完成"
echo " $NEW_PREFIX 当前内容:"
ls -la "$NEW_PREFIX" | sed 's/^/ /'
echo
echo " $OLD_PREFIX 下残留检查(应该都没有):"
LEAK=0
for f in ipass-agent.py ipass-agent.pid ipass-agent.log .ipass-agent-token; do
if [ -e "$OLD_PREFIX/$f" ]; then
c_warn " 残留:$OLD_PREFIX/$f"
LEAK=1
fi
done
[ "$LEAK" = "0" ] && c_ok " 无残留"
echo
echo " 远端 agent.sh 还能正常工作(token 已带过来,无需改 .env)"