feat: update deployment script to use bate branch for source installation

This commit is contained in:
baoweise
2026-05-29 14:20:42 +08:00
parent c2cc3780ec
commit 280dc50020
+14 -11
View File
@@ -82,7 +82,8 @@ fi
# 4. Clone or pull the repository # 4. Clone or pull the repository
INSTALL_DIR="/opt/aimilivpn" INSTALL_DIR="/opt/aimilivpn"
echo -e "\n${YELLOW}[2/4] 正在从 GitHub 部署源代码到 ${INSTALL_DIR}...${PLAIN}" DEPLOY_BRANCH="bate"
echo -e "\n${YELLOW}[2/4] 正在从 GitHub 部署源代码到 ${INSTALL_DIR} (分支: ${DEPLOY_BRANCH})...${PLAIN}"
if [ -f "${INSTALL_DIR}/.local_dev" ]; then if [ -f "${INSTALL_DIR}/.local_dev" ]; then
echo -e "${GREEN}检测到本地开发模式 (.local_dev),跳过 git pull/reset 保持本地修改。${PLAIN}" echo -e "${GREEN}检测到本地开发模式 (.local_dev),跳过 git pull/reset 保持本地修改。${PLAIN}"
else else
@@ -90,25 +91,26 @@ else
echo -e " -> 目录 ${INSTALL_DIR} 已存在,正在更新并强制覆盖本地源码..." echo -e " -> 目录 ${INSTALL_DIR} 已存在,正在更新并强制覆盖本地源码..."
cd "${INSTALL_DIR}" cd "${INSTALL_DIR}"
git fetch --all || true git fetch --all || true
BRANCH="main" git checkout "${DEPLOY_BRANCH}" || git checkout -b "${DEPLOY_BRANCH}" "origin/${DEPLOY_BRANCH}" || true
if git rev-parse --verify origin/main >/dev/null 2>&1; then echo -e " -> 正在强制重置本地源码至 origin/${DEPLOY_BRANCH} ..."
BRANCH="main" if git reset --hard "origin/${DEPLOY_BRANCH}"; then
elif git rev-parse --verify origin/master >/dev/null 2>&1; then
BRANCH="master"
fi
echo -e " -> 正在强制重置本地源码至 origin/${BRANCH} ..."
if git reset --hard "origin/${BRANCH}"; then
echo -e "${GREEN} -> 源码更新成功!${PLAIN}" echo -e "${GREEN} -> 源码更新成功!${PLAIN}"
else else
if git pull; then if git pull origin "${DEPLOY_BRANCH}"; then
echo -e "${GREEN} -> 源码更新成功!${PLAIN}" echo -e "${GREEN} -> 源码更新成功!${PLAIN}"
else else
echo -e "${YELLOW} -> 警告: git pull/reset 失败,将保留当前本地源码并继续安装。${PLAIN}" echo -e "${YELLOW} -> 警告: git pull/reset 失败,将保留当前本地源码并继续安装。${PLAIN}"
fi fi
fi fi
else else
echo -e " -> 正在克隆 GitHub 仓库 ${GITHUB_URL} ..." echo -e " -> 正在克隆 GitHub 仓库 ${GITHUB_URL} (分支: ${DEPLOY_BRANCH}) ..."
if git clone -b "${DEPLOY_BRANCH}" "${GITHUB_URL}" "${INSTALL_DIR}"; then
echo -e "${GREEN} -> 克隆成功!${PLAIN}"
else
echo -e " -> 尝试默认克隆..."
if git clone "${GITHUB_URL}" "${INSTALL_DIR}"; then if git clone "${GITHUB_URL}" "${INSTALL_DIR}"; then
cd "${INSTALL_DIR}"
git checkout "${DEPLOY_BRANCH}" || git checkout -b "${DEPLOY_BRANCH}" "origin/${DEPLOY_BRANCH}" || true
echo -e "${GREEN} -> 克隆成功!${PLAIN}" echo -e "${GREEN} -> 克隆成功!${PLAIN}"
else else
echo -e "${RED} -> 错误: 无法克隆仓库 ${GITHUB_URL},请检查网络!${PLAIN}" echo -e "${RED} -> 错误: 无法克隆仓库 ${GITHUB_URL},请检查网络!${PLAIN}"
@@ -116,6 +118,7 @@ else
fi fi
fi fi
fi fi
fi
# 5. Configure Service # 5. Configure Service
echo -e "\n${YELLOW}[3/4] 正在配置系统服务...${PLAIN}" echo -e "\n${YELLOW}[3/4] 正在配置系统服务...${PLAIN}"