diff --git a/Scripts/AutoBuild_DiyScript.sh b/Scripts/AutoBuild_DiyScript.sh index ee80450..70b8566 100644 --- a/Scripts/AutoBuild_DiyScript.sh +++ b/Scripts/AutoBuild_DiyScript.sh @@ -57,8 +57,8 @@ Diy-Part2() { Diy-Part3() { GET_TARGET_INFO Default_Firmware="openwrt-${TARGET_BOARD}-${TARGET_SUBTARGET}-${TARGET_PROFILE}-squashfs-sysupgrade.bin" - AutoBuild_Firmware="AutoBuild-${TARGET_PROFILE}-Lede-${Openwrt_Version}.bin" - AutoBuild_Detail="AutoBuild-${TARGET_PROFILE}-Lede-${Openwrt_Version}.detail" + AutoBuild_Firmware="AutoBuild-${TARGET_PROFILE}-${Openwrt_Version}.bin" + AutoBuild_Detail="AutoBuild-${TARGET_PROFILE}-${Openwrt_Version}.detail" mkdir -p bin/Firmware echo "Firmware: ${AutoBuild_Firmware}" mv -f bin/targets/"${TARGET_BOARD}/${TARGET_SUBTARGET}/${Default_Firmware}" bin/Firmware/"${AutoBuild_Firmware}" diff --git a/Scripts/AutoBuild_Function.sh b/Scripts/AutoBuild_Function.sh index e104d57..524681a 100644 --- a/Scripts/AutoBuild_Function.sh +++ b/Scripts/AutoBuild_Function.sh @@ -10,7 +10,7 @@ GET_TARGET_INFO() { [ -z ${AutoUpdate_Version} ] && AutoUpdate_Version="未知" Default_File="package/lean/default-settings/files/zzz-default-settings" [ -f ${Default_File} ] && Lede_Version=$(egrep -o "R[0-9]+\.[0-9]+\.[0-9]+" $Default_File) - [ -z ${Lede_Version} ] && Lede_Version="AutoBuild" + [ -z ${Lede_Version} ] && Lede_Version="Openwrt" Openwrt_Version="${Lede_Version}-${Compile_Date}" TARGET_PROFILE=$(egrep -o "CONFIG_TARGET.*DEVICE.*=y" .config | sed -r 's/.*DEVICE_(.*)=y/\1/') [ -z "${TARGET_PROFILE}" ] && TARGET_PROFILE="${Default_Device}"