diff --git a/deploy/install.sh b/deploy/install.sh index a87f15f..5cf16f7 100755 --- a/deploy/install.sh +++ b/deploy/install.sh @@ -38,7 +38,7 @@ command -v curl >/dev/null 2>&1 || (apt-get update && apt-get install -y curl || # 获取最新版本 tag info "正在获取 VPS-Commander 最新版本信息..." -LATEST_TAG=$(curl -fsSL -k "${GITEA_URL}/api/v1/repos/${REPO}/releases/latest" 2>/dev/null | grep '"tag_name":' | head -n1 | sed -E 's/.*"([^"]+)".*/\1/') +LATEST_TAG=$(curl -fsSL -k "${GITEA_URL}/api/v1/repos/${REPO}/releases/latest" 2>/dev/null | grep -o '"tag_name":"[^"]*"' | head -n1 | cut -d'"' -f4) if [ -z "$LATEST_TAG" ]; then warn "无法通过 Gitea API 自动获取 Tag,回退至 v1.1.5" LATEST_TAG="v1.1.5" @@ -81,7 +81,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=*** +VPS_COMMANDER_CLUSTER_SECRET=${CLUSTER_SECRET} ENV chmod 0600 "${CONF_DIR}/agent.env" @@ -134,23 +134,23 @@ install_hub() { read -rp "请输入监听端口 (默认 9521): " HUB_PORT HUB_PORT=${HUB_PORT:-9521} - 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) + GEN_API_KEY=$(head -c 24 /dev/urandom | xxd -p 2>/dev/null || openssl rand -hex 24) + GEN_SECRET=$(head -c 24 /dev/urandom | xxd -p 2>/dev/null || openssl rand -hex 24) + GEN_PASS=$(head -c 16 /dev/urandom | xxd -p 2>/dev/null || openssl rand -hex 16) read -rp "请输入 API Key (默认随机生成): " API_KEY - API_KEY=*** + API_KEY=${API_KEY:-$GEN_API_KEY} read -rp "请输入 Cluster Secret (默认随机生成): " CLUSTER_SECRET - CLUSTER_SECRET=${CLUS…RET} + CLUSTER_SECRET=${CLUSTER_SECRET:-$GEN_SECRET} read -rp "请输入 Web 管理面板密码 (默认随机生成): " WEB_PASS WEB_PASS=${WEB_PASS:-$GEN_PASS} cat << ENV > "${CONF_DIR}/hub.env" -VPS_COMMANDER_API_KEY=*** -VPS_COMMANDER_CLUSTER_SECRET=*** -VPS_COMMANDER_WEB_PASSWORD=*** +VPS_COMMANDER_API_KEY=${API_KEY} +VPS_COMMANDER_CLUSTER_SECRET=${CLUSTER_SECRET} +VPS_COMMANDER_WEB_PASSWORD=${WEB_PASS} ENV chmod 0600 "${CONF_DIR}/hub.env" diff --git a/deploy/upgrade-agent.sh b/deploy/upgrade-agent.sh index 4b8f2d6..0a32066 100755 --- a/deploy/upgrade-agent.sh +++ b/deploy/upgrade-agent.sh @@ -38,7 +38,7 @@ case "$ARCH" in esac info "正在获取最新 Release 版本信息..." -LATEST_TAG=$(curl -fsSL -k "${GITEA_URL}/api/v1/repos/${REPO}/releases/latest" 2>/dev/null | grep '"tag_name":' | head -n1 | sed -E 's/.*"([^"]+)".*/\1/') +LATEST_TAG=$(curl -fsSL -k "${GITEA_URL}/api/v1/repos/${REPO}/releases/latest" 2>/dev/null | grep -o '"tag_name":"[^"]*"' | head -n1 | cut -d'"' -f4) if [ -z "$LATEST_TAG" ]; then warn "无法通过 Gitea API 自动获取 Tag,回退至 v1.1.5" LATEST_TAG="v1.1.5"