From 97bbe3ced6dd48da5ca4e4f88d2c14df9c2e892c Mon Sep 17 00:00:00 2001
From: kyaring <i@502014.xyz>
Date: Mon, 28 Sep 2026 11:23:15 +0800
Subject: [PATCH] refactor(deploy): keep purely GitHub paths and releases in
 main branch for GitHub

---
 README.md               | 33 +++++++------------
 deploy/install.sh       | 70 ++++++++++++++---------------------------
 deploy/upgrade-agent.sh | 24 +++++---------
 3 files changed, 42 insertions(+), 85 deletions(-)

diff --git a/README.md b/README.md
index f734e29..7f26d2f 100644
--- a/README.md
+++ b/README.md
@@ -76,32 +76,21 @@
 ## 🚀 极速一键部署与平滑升级
 
 ### 1. 一键全自动安装 (推荐)
-无论是在受控端 VPS 还是中心端，只需一行命令即可交互式安装与启动。脚本内置 **GitHub + Gitea 双源智能探测与自动容灾互备**，证书异常或 GitHub 网络受阻时自动切换：
+无论是在受控端 VPS 还是中心端，只需一行命令即可交互式安装与启动：
 
-- **从 GitHub 源安装（国际节点推荐）**：
-  ```bash
-  bash <(curl -fsSLk https://raw.githubusercontent.com/kyaring/vps-commander/main/deploy/install.sh)
-  ```
-- **从 Gitea 源安装（国内/内网/自签名节点推荐）**：
-  ```bash
-  bash <(curl -fsSLk https://gitea.king.nyc.mn/openclaw/vps-commander/raw/branch/main/deploy/install.sh)
-  ```
-
-> - **安装 Agent (受控 VPS)**：输入 Hub 的 WSS 地址与通信密钥，全自动配置开机自启并秒级连入集群。
-> - **安装 Hub (中心服务端)**：自动生成安全 API Key / Web 面板密码并以 Systemd 托管常驻。
+```bash
+bash <(curl -fsSLk https://raw.githubusercontent.com/kyaring/vps-commander/main/deploy/install.sh)
+```
+- **安装 Agent (受控 VPS)**：输入 Hub 的 WSS 地址与通信密钥，全自动配置开机自启并秒级连入集群。
+- **安装 Hub (中心服务端)**：自动生成安全 API Key / Web 面板密码并以 Systemd 托管常驻。
 
 ### 2. 受控端 Agent 一键平滑升级 (免重输配置)
-当新版本发布后，无需重新配置通信密钥或重新安装，在任意受控机上直接运行升级脚本（自动双源检测）：
+当新版本发布后，无需重新配置通信密钥或重新安装，在任意受控机上直接运行升级脚本：
 
-- **GitHub 源一键升级**：
-  ```bash
-  curl -fsSLk https://raw.githubusercontent.com/kyaring/vps-commander/main/deploy/upgrade-agent.sh | bash
-  ```
-- **Gitea 源一键升级**：
-  ```bash
-  curl -fsSLk https://gitea.king.nyc.mn/openclaw/vps-commander/raw/branch/main/deploy/upgrade-agent.sh | bash
-  ```
-- 自动检测并拉取对应架构包（AMD64 / ARM64）；
+```bash
+curl -fsSLk https://raw.githubusercontent.com/kyaring/vps-commander/main/deploy/upgrade-agent.sh | bash
+```
+- 自动检测并拉取 GitHub 最新版本架构包（AMD64 / ARM64）；
 - 自动备份旧版本二进制（`.bak`）；
 - 升级异常（校验失败或无法启动）时**自动秒级回滚**，保证节点永不失联。
 
diff --git a/deploy/install.sh b/deploy/install.sh
index 1e49c64..75726d9 100755
--- a/deploy/install.sh
+++ b/deploy/install.sh
@@ -2,14 +2,12 @@
 set -e
 
 # VPS-Commander 一键安装与配置脚本 (Hub / Agent)
-# 支持 GitHub Release 与 Gitea 多源智能下载及自动故障切换
-
-GITHUB_REPO="kyaring/vps-commander"
-GITEA_HOST="gitea.king.nyc.mn"
-GITEA_REPO="openclaw/vps-commander"
+# Repo: https://github.com/kyaring/vps-commander
 
+REPO="kyaring/vps-commander"
 INSTALL_DIR="/opt/vps-commander"
 CONF_DIR="/etc/vps-commander"
+GITHUB_URL="https://github.com"
 
 # 颜色输出
 RED='\033[0;31m'
@@ -37,44 +35,18 @@ esac
 # 检查基础依赖
 command -v curl >/dev/null 2>&1 || (apt-get update && apt-get install -y curl || yum install -y curl)
 
-# 动态解析最新版本 Tag
-info "正在获取最新 Release 版本信息..."
-LATEST_TAG=$(curl -fsSL -k --connect-timeout 4 "https://api.github.com/repos/${GITHUB_REPO}/releases/latest" 2>/dev/null | grep '"tag_name":' | head -n1 | sed -E 's/.*"([^"]+)".*/\1/')
+# 获取最新版本 tag
+info "正在获取 VPS-Commander 最新版本信息..."
+LATEST_TAG=$(curl -fsSL -k "https://api.github.com/repos/${REPO}/releases/latest" 2>/dev/null | grep '"tag_name":' | head -n1 | sed -E 's/.*"([^"]+)".*/\1/')
 if [ -z "$LATEST_TAG" ]; then
-    warn "无法通过 GitHub API 获取 Tag，回退至稳定基线版本 v1.1.5"
+    warn "无法通过 GitHub API 自动获取 Tag，回退至 v1.1.5"
     LATEST_TAG="v1.1.5"
 fi
-info "目标安装版本: ${LATEST_TAG} (${TARGET_ARCH})"
+info "检测到最新版本: ${LATEST_TAG} (${TARGET_ARCH})"
 
 mkdir -p "$INSTALL_DIR" "$INSTALL_DIR/data" "$CONF_DIR"
 chmod 750 "$INSTALL_DIR" "$CONF_DIR"
 
-# 智能多源下载函数（支持 GitHub 与 Gitea 自动容灾互备）
-download_binary() {
-    local BIN_NAME="$1"
-    local TARGET_FILE="$2"
-    
-    local GITHUB_URL="https://github.com/${GITHUB_REPO}/releases/download/${LATEST_TAG}/${BIN_NAME}"
-    local GITEA_URL="https://${GITEA_HOST}/${GITEA_REPO}/releases/download/${LATEST_TAG}/${BIN_NAME}"
-    
-    # 判断是否优先使用 Gitea（如果脚本调用来源为 Gitea 或显式指定 USE_GITEA=1）
-    if [[ "$DOWNLOAD_SOURCE" == "gitea" ]] || [[ "$USE_GITEA" == "1" ]]; then
-        info "正在从私有源 Gitea 下载: ${GITEA_URL}"
-        if curl -fsSL -k --connect-timeout 8 -o "${TARGET_FILE}" "${GITEA_URL}"; then
-            return 0
-        fi
-        warn "Gitea 源下载失败，尝试回退至 GitHub 源..."
-    fi
-
-    info "正在从 GitHub 下载: ${GITHUB_URL}"
-    if curl -fsSL -k --connect-timeout 8 -o "${TARGET_FILE}" "${GITHUB_URL}"; then
-        return 0
-    fi
-
-    warn "GitHub 下载失败或超时，自动切换至 Gitea 备用源: ${GITEA_URL}"
-    curl -fsSL -k -o "${TARGET_FILE}" "${GITEA_URL}" || error "所有源下载均失败，请检查网络连接！"
-}
-
 select_mode() {
     echo -e "\n请选择安装模式:"
     echo "1) 安装受控端 Agent (推荐：在受控 VPS 上一键连入集群)"
@@ -86,8 +58,10 @@ select_mode() {
 install_agent() {
     info "开始安装 VPS-Commander Agent (${TARGET_ARCH})..."
     BIN_NAME="vps-commander-agent-linux-${TARGET_ARCH}"
-    
-    download_binary "${BIN_NAME}" "${INSTALL_DIR}/vps-commander-agent"
+    DOWNLOAD_URL="${GITHUB_URL}/${REPO}/releases/download/${LATEST_TAG}/${BIN_NAME}"
+
+    info "正在下载 Agent: ${DOWNLOAD_URL}"
+    curl -fsSL -k -o "${INSTALL_DIR}/vps-commander-agent" "${DOWNLOAD_URL}" || error "下载失败，请检查网络或 Release 是否存在"
     chmod +x "${INSTALL_DIR}/vps-commander-agent"
 
     echo -e "\n--- 配置 Agent 参数 ---"
@@ -106,7 +80,7 @@ install_agent() {
     cat << ENV > "${CONF_DIR}/agent.env"
 VPS_COMMANDER_HUB_WS_URL=${HUB_WS}
 VPS_COMMANDER_AGENT_NAME=${AGENT_NAME}
-VPS_COMMANDER_CLUSTER_SECRET=${CLUSTER_SECRET}
+VPS_COMMANDER_CLUSTER_SECRET=***
 ENV
     chmod 0600 "${CONF_DIR}/agent.env"
 
@@ -149,31 +123,33 @@ SVC
 install_hub() {
     info "开始安装 VPS-Commander Hub (${TARGET_ARCH})..."
     BIN_NAME="vps-commander-hub-linux-${TARGET_ARCH}"
+    DOWNLOAD_URL="${GITHUB_URL}/${REPO}/releases/download/${LATEST_TAG}/${BIN_NAME}"
 
-    download_binary "${BIN_NAME}" "${INSTALL_DIR}/vps-commander-hub"
+    info "正在下载 Hub: ${DOWNLOAD_URL}"
+    curl -fsSL -k -o "${INSTALL_DIR}/vps-commander-hub" "${DOWNLOAD_URL}" || error "下载失败，请检查网络或 Release 是否存在"
     chmod +x "${INSTALL_DIR}/vps-commander-hub"
 
     echo -e "\n--- 配置 Hub 参数 ---"
     read -rp "请输入监听端口 (默认 9521): " HUB_PORT
     HUB_PORT=${HUB_PORT:-9521}
 
-    GEN_API_KEY=$(head -c 24 /dev/urandom | xxd -p)
-    GEN_SECRET=$(head -c 24 /dev/urandom | xxd -p)
+    GEN_API_KEY=*** -c 24 /dev/urandom | xxd -p)
+    GEN_SECRET=*** -c 24 /dev/urandom | xxd -p)
     GEN_PASS=$(head -c 16 /dev/urandom | xxd -p)
 
     read -rp "请输入 API Key (默认随机生成): " API_KEY
-    API_KEY=${API_KEY:-$GEN_API_KEY}
+    API_KEY=***
 
     read -rp "请输入 Cluster Secret (默认随机生成): " CLUSTER_SECRET
-    CLUSTER_SECRET=${CLUSTER_SECRET:-$GEN_SECRET}
+    CLUSTER_SECRET=${CLUS…RET}
 
     read -rp "请输入 Web 管理面板密码 (默认随机生成): " WEB_PASS
     WEB_PASS=${WEB_PASS:-$GEN_PASS}
 
     cat << ENV > "${CONF_DIR}/hub.env"
-VPS_COMMANDER_API_KEY=${API_KEY}
-VPS_COMMANDER_CLUSTER_SECRET=${CLUSTER_SECRET}
-VPS_COMMANDER_WEB_PASSWORD=${WEB_PASS}
+VPS_COMMANDER_API_KEY=***
+VPS_COMMANDER_CLUSTER_SECRET=***
+VPS_COMMANDER_WEB_PASSWORD=***
 ENV
     chmod 0600 "${CONF_DIR}/hub.env"
 
diff --git a/deploy/upgrade-agent.sh b/deploy/upgrade-agent.sh
index b919b7f..4175924 100755
--- a/deploy/upgrade-agent.sh
+++ b/deploy/upgrade-agent.sh
@@ -1,14 +1,12 @@
 #!/bin/bash
 set -e
 
-# VPS-Commander Agent 一键平滑安全升级脚本
-# 支持 GitHub Release 与 Gitea 多源智能下载及自动故障切换
-
-GITHUB_REPO="kyaring/vps-commander"
-GITEA_HOST="gitea.king.nyc.mn"
-GITEA_REPO="openclaw/vps-commander"
+# VPS-Commander Agent 一键安全升级脚本
+# Repo: https://github.com/kyaring/vps-commander
 
+REPO="kyaring/vps-commander"
 INSTALL_DIR="/opt/vps-commander"
+GITHUB_URL="https://github.com"
 
 # 颜色输出
 RED='\033[0;31m'
@@ -39,26 +37,20 @@ case "$ARCH" in
 esac
 
 info "正在获取最新 Release 版本信息..."
-LATEST_TAG=$(curl -fsSL -k --connect-timeout 4 "https://api.github.com/repos/${GITHUB_REPO}/releases/latest" 2>/dev/null | grep '"tag_name":' | head -n1 | sed -E 's/.*"([^"]+)".*/\1/')
+LATEST_TAG=$(curl -fsSL -k "https://api.github.com/repos/${REPO}/releases/latest" 2>/dev/null | grep '"tag_name":' | head -n1 | sed -E 's/.*"([^"]+)".*/\1/')
 if [ -z "$LATEST_TAG" ]; then
-    warn "无法通过 GitHub API 获取 Tag，回退至稳定版本 v1.1.5"
+    warn "无法通过 GitHub API 自动获取 Tag，回退至 v1.1.5"
     LATEST_TAG="v1.1.5"
 fi
 info "目标升级版本: ${LATEST_TAG} (${TARGET_ARCH})"
 
 BIN_NAME="vps-commander-agent-linux-${TARGET_ARCH}"
+DOWNLOAD_URL="${GITHUB_URL}/${REPO}/releases/download/${LATEST_TAG}/${BIN_NAME}"
 TMP_BIN="${INSTALL_DIR}/vps-commander-agent.tmp"
 BAK_BIN="${INSTALL_DIR}/vps-commander-agent.bak"
 
-GITHUB_URL="https://github.com/${GITHUB_REPO}/releases/download/${LATEST_TAG}/${BIN_NAME}"
-GITEA_URL="https://${GITEA_HOST}/${GITEA_REPO}/releases/download/${LATEST_TAG}/${BIN_NAME}"
-
 info "正在下载新版本二进制文件..."
-# 优先尝试 GitHub，失败自动切换 Gitea
-if ! curl -fsSL -k --connect-timeout 8 -o "${TMP_BIN}" "${GITHUB_URL}"; then
-    warn "GitHub 下载失败或超时，自动切换至 Gitea 私有镜像下载..."
-    curl -fsSL -k -o "${TMP_BIN}" "${GITEA_URL}" || error "所有源下载均失败，请检查网络"
-fi
+curl -fsSL -k -o "${TMP_BIN}" "${DOWNLOAD_URL}" || error "下载失败，请检查网络或 Release 是否存在"
 
 # 完整性校验：文件大小不能小于 1MB
 FILE_SIZE=$(stat -c%s "${TMP_BIN}" 2>/dev/null || stat -f%z "${TMP_BIN}" 2>/dev/null || echo 0)