fix(ios): 修复 deploy.sh 旧路径 与 renew.sh --check 两处 bug
- deploy.sh: cd 硬编码旧 /Desktop/ruoyi 路径, 改为 dirname $0 自适应 - renew.sh: prof_expiry_epoch 改用 security cms 抠 ISO8601 按 UTC 解析(原 PlistBuddy+%Z 在 macOS date -j 下静默失败); 到期解析失败时 --check 补只读兜底 exit 防误删; 修 $BACKUP_DIR 紧跟全角逗号在 set -u 下的 unbound 崩溃 Co-Authored-By: Claude Opus 4.8 <[email protected]>
This commit is contained in:
1 parent
9b7d8322a0
commit
b9327eee8b
2 files changed
+189
-1
No files matched your search
@@ -2,7 +2,7 @@
|
||||
# 真机部署脚本:编译 GlassRemote 并安装到吴小苏的iPhone(WiFi 配对通道)
|
||||
# 用法: bash deploy.sh (Xcode 需已登录 Apple ID 且团队可用)
|
||||
set -u
|
||||
cd /Users/xs/Desktop/ruoyi/glass/ios/GlassRemote
|
||||
cd "$(dirname "$0")"
|
||||
|
||||
TEAM=H2C3YSR973
|
||||
UDID=D469A28E-D29F-54A0-8936-0EA41BA02DA2
|
||||
|
||||
Executable
+188
@@ -0,0 +1,188 @@
|
||||
#!/bin/bash
|
||||
# 一键续签 + 重新部署 GlassRemote
|
||||
#
|
||||
# 背景(踩坑结论):
|
||||
# 免费 Apple ID 的 provisioning profile 只有 7 天有效期,到期后 app 无法启动。
|
||||
# Xcode 在 profile 尚未过期时「不会」主动续签,光跑 deploy.sh 只会复用旧的,
|
||||
# 所以必须删掉本地 profile 逼它向 Apple 重新申请。
|
||||
#
|
||||
# 注意区分两种「到期」:
|
||||
# - profile 过期(7 天) → 本脚本可自动处理
|
||||
# - Xcode 账号会话失效(数周)→ 无法命令行修复,必须 GUI 重登,本脚本会检测并提示
|
||||
#
|
||||
# 前置:Xcode 已登录 Apple ID(⌘, → Accounts → +)
|
||||
#
|
||||
# 用法:
|
||||
# bash renew.sh # 剩余 >3 天则只提示不动作;否则自动续签+安装
|
||||
# bash renew.sh --force # 无条件续签
|
||||
# bash renew.sh --check # 只查到期时间,不做任何改动
|
||||
#
|
||||
# 退出码: 0=成功/无需续签 2=Xcode 账号失效 3=iPhone 未连接
|
||||
# 4=编译失败 5=profile 未真正更新
|
||||
set -u
|
||||
|
||||
cd "$(dirname "$0")"
|
||||
|
||||
TEAM=H2C3YSR973
|
||||
UDID=D469A28E-D29F-54A0-8936-0EA41BA02DA2
|
||||
DD=/tmp/dd_deploy
|
||||
LOG=/tmp/deploy_now.log
|
||||
PROF_DIR="$HOME/Library/Developer/Xcode/UserData/Provisioning Profiles"
|
||||
BACKUP_DIR=/tmp/profile-backup
|
||||
LOGIN_HINT="请打开 Xcode → Settings(⌘,) → Accounts → 左下角 + → Apple ID 登录 [email protected],登录后重跑本脚本"
|
||||
|
||||
FORCE=0; CHECK=0
|
||||
for a in "$@"; do
|
||||
case "$a" in
|
||||
--force) FORCE=1 ;;
|
||||
--check) CHECK=1 ;;
|
||||
esac
|
||||
done
|
||||
|
||||
: > "$LOG"
|
||||
say() { echo "$@" | tee -a "$LOG"; }
|
||||
|
||||
# 读取 profile 的到期时间并转成 epoch 秒
|
||||
prof_expiry_epoch() {
|
||||
local f="$1" s
|
||||
[ -f "$f" ] || return
|
||||
# ExpirationDate 在 plist 里是 XML <date>ISO8601Z</date>;PlistBuddy 打印出的串带
|
||||
# 时区名,macOS date -j 用 %Z 解析不出来(老 bug:静默返回空 → --check 反而继续删
|
||||
# profile)。直接从 security cms 明文里抠 ISO 串最稳,再按 UTC 解析。
|
||||
s=$(security cms -D -i "$f" 2>/dev/null \
|
||||
| grep -A1 '<key>ExpirationDate</key>' \
|
||||
| grep -oE '[0-9]{4}-[0-9]{2}-[0-9]{2}T[0-9]{2}:[0-9]{2}:[0-9]{2}Z')
|
||||
if [ -n "${s:-}" ]; then
|
||||
date -j -u -f "%Y-%m-%dT%H:%M:%SZ" "$s" +%s 2>/dev/null
|
||||
fi
|
||||
}
|
||||
|
||||
# ---------- [0/5] 环境预检:沙箱会阻断 keychain,让 xcodebuild 误报 No Accounts ----------
|
||||
SANDBOX_BLOCKED=0
|
||||
if security add-generic-password -a "glassrenew-probe" -s "glassrenew-probe" -w probe -U >/dev/null 2>&1; then
|
||||
security delete-generic-password -a "glassrenew-probe" -s "glassrenew-probe" >/dev/null 2>&1
|
||||
else
|
||||
SANDBOX_BLOCKED=1
|
||||
say "!! 警告:keychain 不可写,当前很可能运行在沙箱环境中。"
|
||||
say "!! 沙箱会让 xcodebuild 读不到 Xcode 账号,从而误报「No Accounts」。"
|
||||
say "!! 请在【普通终端】直接运行:cd $(pwd) && bash renew.sh"
|
||||
say "!! (账号本身通常是好的,不是登录过期)"
|
||||
say ""
|
||||
fi
|
||||
|
||||
# ---------- [1/5] 现状检查 ----------
|
||||
say "=== [1/5] 检查现有 provisioning profile ==="
|
||||
OLD_PROF=$(ls "$PROF_DIR"/*.mobileprovision 2>/dev/null | head -1)
|
||||
NOW=$(date +%s)
|
||||
EXP=""
|
||||
if [ -n "${OLD_PROF:-}" ]; then
|
||||
EXP=$(prof_expiry_epoch "$OLD_PROF")
|
||||
if [ -n "${EXP:-}" ]; then
|
||||
LEFT_H=$(( (EXP - NOW) / 3600 ))
|
||||
say "文件: $(basename "$OLD_PROF")"
|
||||
say "到期: $(date -r "$EXP" '+%Y-%m-%d %H:%M:%S') (剩余 ${LEFT_H} 小时)"
|
||||
if [ "$CHECK" = "1" ]; then exit 0; fi
|
||||
if [ "$FORCE" = "0" ] && [ "$LEFT_H" -gt 72 ]; then
|
||||
say ""
|
||||
say "剩余超过 3 天,暂不续签。要强制续签请执行: bash renew.sh --force"
|
||||
exit 0
|
||||
fi
|
||||
fi
|
||||
else
|
||||
say "本地已无 profile,需要向 Apple 重新申请"
|
||||
if [ "$CHECK" = "1" ]; then exit 0; fi
|
||||
fi
|
||||
|
||||
# --check 是只读模式:报告完就退出,绝不往下走删 profile 的步骤
|
||||
# (防御性兜底:万一到期时间仍解析不出来,也不会误删还能用的 profile)
|
||||
if [ "$CHECK" = "1" ]; then exit 0; fi
|
||||
|
||||
# ---------- [2/5] 设备检查 ----------
|
||||
say ""
|
||||
say "=== [2/5] 检查 iPhone 连接 ==="
|
||||
if ! xcrun devicectl list devices 2>/dev/null | grep -q "$UDID"; then
|
||||
say "!!! iPhone 未连接。请插数据线或确认同 WiFi 已配对,并保持解锁状态。"
|
||||
exit 3
|
||||
fi
|
||||
say "iPhone 在线"
|
||||
|
||||
# ---------- [3/5] 作废旧 profile ----------
|
||||
say ""
|
||||
say "=== [3/5] 作废旧 profile(强制 Xcode 重新申请)==="
|
||||
mkdir -p "$BACKUP_DIR"
|
||||
if [ -n "${OLD_PROF:-}" ]; then
|
||||
cp -f "$OLD_PROF" "$BACKUP_DIR"/ 2>/dev/null
|
||||
rm -f "$OLD_PROF"
|
||||
say "已备份至 ${BACKUP_DIR},并删除旧 profile"
|
||||
fi
|
||||
|
||||
# ---------- [4/5] 编译并签名 ----------
|
||||
say ""
|
||||
say "=== [4/5] 编译并签名(约 2 分钟)==="
|
||||
xcodebuild -project GlassRemote.xcodeproj -scheme GlassRemote \
|
||||
-destination "platform=iOS,id=$UDID" \
|
||||
-derivedDataPath "$DD" \
|
||||
DEVELOPMENT_TEAM=$TEAM CODE_SIGN_STYLE=Automatic \
|
||||
-allowProvisioningUpdates \
|
||||
build 2>&1 | tee -a "$LOG"
|
||||
BUILD_EXIT=${PIPESTATUS[0]}
|
||||
echo "BUILD_EXIT=$BUILD_EXIT" | tee -a "$LOG"
|
||||
|
||||
if [ "$BUILD_EXIT" != "0" ]; then
|
||||
if grep -q "No Accounts" "$LOG" 2>/dev/null; then
|
||||
say ""
|
||||
say "!!! xcodebuild 报 No Accounts —— 先分清是哪种原因:"
|
||||
if [ "$SANDBOX_BLOCKED" = "1" ]; then
|
||||
say "!!! 【沙箱阻断】keychain 不可写,xcodebuild 读不到账号凭据。"
|
||||
say "!!! 解法:在普通终端直接跑 bash renew.sh(绕过沙箱)。账号是好的,无需重登。"
|
||||
else
|
||||
say "!!! 【账号失效】$LOGIN_HINT"
|
||||
fi
|
||||
RC=2
|
||||
else
|
||||
say ""
|
||||
say "!!! 编译失败,详见 $LOG"
|
||||
RC=4
|
||||
fi
|
||||
# 回滚:别把还能用的旧 profile 弄丢
|
||||
if [ -n "${OLD_PROF:-}" ] && [ ! -f "$OLD_PROF" ]; then
|
||||
cp -f "$BACKUP_DIR"/*.mobileprovision "$PROF_DIR"/ 2>/dev/null && say "已回滚旧 profile"
|
||||
fi
|
||||
exit $RC
|
||||
fi
|
||||
|
||||
APP=$(find "$DD" -name "GlassRemote.app" -type d | head -1)
|
||||
say "APP=$APP"
|
||||
if [ -z "${APP:-}" ]; then
|
||||
say "!!! 未找到 .app"
|
||||
exit 4
|
||||
fi
|
||||
|
||||
# 校验 profile 是否真的换了新的
|
||||
NEW_EXP=$(prof_expiry_epoch "$APP/embedded.mobileprovision")
|
||||
if [ -z "${NEW_EXP:-}" ]; then
|
||||
# 兜底:改读 profile 目录里最新的那个(有些情况下 app 内嵌文件的 cms 读取会失败)
|
||||
NEW_PROF=$(ls -t "$PROF_DIR"/*.mobileprovision 2>/dev/null | head -1)
|
||||
[ -n "${NEW_PROF:-}" ] && NEW_EXP=$(prof_expiry_epoch "$NEW_PROF")
|
||||
fi
|
||||
if [ -n "${NEW_EXP:-}" ]; then
|
||||
say "新 profile 到期: $(date -r "$NEW_EXP" '+%Y-%m-%d %H:%M:%S')"
|
||||
if [ -n "${EXP:-}" ] && [ "$NEW_EXP" -le "$EXP" ]; then
|
||||
say "!!! profile 未更新(仍是旧的,Xcode 复用了缓存)"
|
||||
say "!!! 请执行 rm -rf $DD 后重跑本脚本"
|
||||
exit 5
|
||||
fi
|
||||
else
|
||||
say "!!! 无法读取新 profile 到期时间"
|
||||
fi
|
||||
|
||||
# ---------- [5/5] 安装 ----------
|
||||
say ""
|
||||
say "=== [5/5] 安装到 iPhone ==="
|
||||
say "(devicectl 使能 DDI 官方耗时约 2 分钟,慢是正常的,看 APP= 行判断进度)"
|
||||
xcrun devicectl device install app --device "$UDID" "$APP" 2>&1 | tee -a "$LOG"
|
||||
INSTALL_EXIT=${PIPESTATUS[0]}
|
||||
echo "INSTALL_EXIT=$INSTALL_EXIT" | tee -a "$LOG"
|
||||
say ""
|
||||
say "=== DONE ==="
|
||||
exit $INSTALL_EXIT
|
||||
Reference in new issue
Block a user