diff --git a/deploy.sh b/deploy.sh index 27a2094..a385caa 100644 --- a/deploy.sh +++ b/deploy.sh @@ -178,9 +178,9 @@ check_container() { # ---------- 版本管理函数 ---------- read_version_file() { - local version_file="./VERSION.ini" + local version_file="./version.ini" if [ ! -f "$version_file" ]; then - print_error "VERSION.ini 文件不存在: $version_file" + print_error "version.ini 文件不存在: $version_file" return 1 fi SEMVER=$(grep -v "^[;#]" "$version_file" | head -1 | awk '{print $1}') @@ -206,7 +206,7 @@ generate_target_version() { LTS_DATE=$(echo "$semver_lts_date" | awk '{print $2}') if [ -z "$SEMVER" ]; then - print_error "无法从 VERSION.ini 读取语义版本" + print_error "无法从 version.ini 读取语义版本" exit 1 fi @@ -229,12 +229,12 @@ generate_target_version() { } get_current_version() { - local version_file="${DEPLOY_DIR}/VERSION.ini" + local version_file="${DEPLOY_DIR}/version.ini" if [ -f "$version_file" ]; then grep -v "^[;#]" "$version_file" | head -1 | tr -d '\n' else if [ "$CONTAINER_EXISTS" = true ]; then - docker exec frpc-console cat /app/VERSION.ini 2>/dev/null | grep -v "^[;#]" | head -1 | tr -d '\n' || echo "0.0.0-dev" + docker exec frpc-console cat /app/version.ini 2>/dev/null | grep -v "^[;#]" | head -1 | tr -d '\n' || echo "0.0.0-dev" else echo "0.0.0-dev" fi @@ -630,7 +630,7 @@ do_deploy() { # ----- 验证版本写入 ----- print_step "验证版本..." sleep 1 - CONTAINER_VERSION=$(docker exec frpc-console cat /app/VERSION.ini 2>/dev/null | grep -v "^[;#]" | head -1 | tr -d '\n' || echo "unknown") + CONTAINER_VERSION=$(docker exec frpc-console cat /app/version.ini 2>/dev/null | grep -v "^[;#]" | head -1 | tr -d '\n' || echo "unknown") echo -e " 容器版本: ${CONTAINER_VERSION}" echo -e " 目标版本: ${TARGET_VERSION}" if [ "$CONTAINER_VERSION" = "$TARGET_VERSION" ]; then @@ -668,7 +668,7 @@ do_deploy() { echo " docker restart frpc-console # 重启服务" echo " docker stop frpc-console # 停止服务" echo " docker start frpc-console # 启动服务" - echo " cat ${DEPLOY_DIR}/VERSION.ini # 查看当前版本" + echo " cat ${DEPLOY_DIR}/version.ini # 查看当前版本" echo "" echo -e " ${YELLOW}首次访问需要注册管理员账户${NC}" echo "" diff --git a/main.go b/main.go index 675125d..ad95d6f 100644 --- a/main.go +++ b/main.go @@ -14,9 +14,9 @@ var ( ) func main() { - // 写入 VERSION.ini 到持久化目录 - if err := os.WriteFile("./VERSION.ini", []byte(buildVersion+"\n"), 0644); err != nil { - log.Printf("⚠️ 写入 VERSION.ini 失败: %v", err) + // 写入 version.ini 到持久化目录 + if err := os.WriteFile("./version.ini", []byte(buildVersion+"\n"), 0644); err != nil { + log.Printf("⚠️ 写入 version.ini 失败: %v", err) } else { log.Printf("📌 版本: %s", buildVersion) } diff --git a/script/build.go b/script/build.go index b44e6d6..6d59625 100644 --- a/script/build.go +++ b/script/build.go @@ -36,7 +36,7 @@ const ( // ============================================================ func readVersion() (semver string, ltsDate string) { - data, err := os.ReadFile("./VERSION.ini") + data, err := os.ReadFile("./version.ini") if err != nil { return "0.0.0", "" }