diff --git a/build.sh b/build.sh index 3bd127e..d6ca4cb 100644 --- a/build.sh +++ b/build.sh @@ -556,14 +556,13 @@ setup_kmod_package_name() { # 打包和生成OTA文件 package_and_generate_ota() { local architecture="$1" - local version="$2" print_info "开始打包和生成OTA文件..." if [ "$architecture" = "x86_64" ]; then - process_x86_64 "$version" + process_x86_64 elif [ "$architecture" = "rockchip" ]; then - process_rockchip "$version" + process_rockchip else print_warning "未知架构: $architecture,跳过打包和OTA生成" fi @@ -573,7 +572,6 @@ package_and_generate_ota() { # 处理 x86_64 架构 process_x86_64() { - local version="$1" print_info "处理 x86_64 架构的打包..." @@ -612,7 +610,6 @@ process_x86_64() { # 生成 x86_64 OTA JSON generate_x86_64_ota_json() { - local version="$1" print_info "生成 x86_64 OTA JSON 文件..." @@ -621,7 +618,7 @@ generate_x86_64_ota_json() { echo -e "${BLUE_COLOR}├─ 计算 SHA256 校验和...${RESET}" local OTA_URL="https://github.com/QuickWrt/ZeroWrt/releases/download" - local VERSION_NUMBER=$(echo "$version" | sed 's/v//g') + local VERSION_NUMBER=$(echo "$$tag_version" | sed 's/v//g') local SHA256=$(sha256sum bin/targets/x86/64*/*-generic-squashfs-combined-efi.img.gz | awk '{print $1}') echo -e "${BLUE_COLOR}├─ 生成 JSON 文件...${RESET}" @@ -647,7 +644,6 @@ EOF # 处理 rockchip 架构 process_rockchip() { - local version="$1" print_info "处理 rockchip 架构的打包..." @@ -686,7 +682,6 @@ process_rockchip() { # 生成 rockchip OTA JSON generate_rockchip_ota_json() { - local version="$1" print_info "生成 rockchip OTA JSON 文件..." @@ -695,7 +690,7 @@ generate_rockchip_ota_json() { echo -e "${BLUE_COLOR}├─ 计算各设备的 SHA256 校验和...${RESET}" local OTA_URL="https://github.com/QuickWrt/ZeroWrt/releases/download" - local VERSION_NUMBER=$(echo "$version" | sed 's/v//g') + local VERSION_NUMBER=$(echo "$$tag_version" | sed 's/v//g') # 计算各个设备的SHA256 local SHA256_armsom_sige3=$(sha256sum bin/targets/rockchip/armv8*/zerowrt-$VERSION_NUMBER-rockchip-armv8-armsom_sige3-squashfs-sysupgrade.img.gz | awk '{print $1}') @@ -940,7 +935,7 @@ main() { if [[ "$BUILD_MODE" != "toolchain-only" ]]; then setup_kmod_package_name - package_and_generate_ota "$architecture" "$version" + package_and_generate_ota "$architecture" fi # 计算总耗时