xinb
/
X-OpenWrt
mirror of https://github.com/xopenwrt/X-OpenWrt-New.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

优化代码、修复一些潜在问题

This commit is contained in:
Hyy2001X 2021-01-14 19:13:24 +08:00
parent c801a52de3
commit d19d49466a
1 changed files with 12 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
Scripts/AutoBuild_Function.sh
View File

@ -6,13 +6,13 @@
GET_TARGET_INFO() { GET_TARGET_INFO() {
[ -f ${GITHUB_WORKSPACE}/Openwrt.info ] && . ${GITHUB_WORKSPACE}/Openwrt.info [ -f ${GITHUB_WORKSPACE}/Openwrt.info ] && . ${GITHUB_WORKSPACE}/Openwrt.info
Default_File="package/lean/default-settings/files/zzz-default-settings" 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) [ -f ${Default_File} ] && Lede_Version="$(egrep -o "R[0-9]+\.[0-9]+\.[0-9]+" $Default_File)"
[ -z ${Lede_Version} ] && Lede_Version="Openwrt" [ -z ${Lede_Version} ] && Lede_Version="Openwrt"
Openwrt_Version="${Lede_Version}-${Compile_Date}" Openwrt_Version="${Lede_Version}-${Compile_Date}"
TARGET_PROFILE=$(egrep -o "CONFIG_TARGET.*DEVICE.*=y" .config | sed -r 's/.*DEVICE_(.*)=y/\1/') TARGET_PROFILE="$(egrep -o "CONFIG_TARGET.*DEVICE.*=y" .config | sed -r 's/.*DEVICE_(.*)=y/\1/')"
[ -z "${TARGET_PROFILE}" ] && TARGET_PROFILE="${Default_Device}" [ -z "${TARGET_PROFILE}" ] && TARGET_PROFILE="${Default_Device}"
TARGET_BOARD=$(awk -F '[="]+' '/TARGET_BOARD/{print $2}' .config) TARGET_BOARD="$(awk -F '[="]+' '/TARGET_BOARD/{print $2}' .config)"
TARGET_SUBTARGET=$(awk -F '[="]+' '/TARGET_SUBTARGET/{print $2}' .config) TARGET_SUBTARGET="$(awk -F '[="]+' '/TARGET_SUBTARGET/{print $2}' .config)"
Github_Repo="$(grep "https://github.com/[a-zA-Z0-9]" ${GITHUB_WORKSPACE}/.git/config | cut -c8-100)" Github_Repo="$(grep "https://github.com/[a-zA-Z0-9]" ${GITHUB_WORKSPACE}/.git/config | cut -c8-100)"
} }
@ -35,23 +35,26 @@ Diy_Part2_Base() {
Diy_Core Diy_Core
GET_TARGET_INFO GET_TARGET_INFO
if [ "${INCLUDE_AutoUpdate}" == "true" ];then if [ "${INCLUDE_AutoUpdate}" == "true" ];then
Replace_File Scripts/AutoUpdate.sh package/base-files/files/bin
ExtraPackages git lean luci-app-autoupdate https://github.com/Hyy2001X main ExtraPackages git lean luci-app-autoupdate https://github.com/Hyy2001X main
sed -i '/luci-app-autoupdate/d' .config > /dev/null 2>&1 sed -i '/luci-app-autoupdate/d' .config > /dev/null 2>&1
echo "CONFIG_PACKAGE_luci-app-autoupdate=y" >> .config echo "CONFIG_PACKAGE_luci-app-autoupdate=y" >> .config
fi Replace_File Scripts/AutoUpdate.sh package/base-files/files/bin
AutoUpdate_Version=$(awk 'NR==6' package/base-files/files/bin/AutoUpdate.sh | awk -F '[="]+' '/Version/{print $2}') AutoUpdate_Version=$(awk 'NR==6' package/base-files/files/bin/AutoUpdate.sh | awk -F '[="]+' '/Version/{print $2}')
[[ -z "${AutoUpdate_Version}" ]] && AutoUpdate_Version="Unknown version" [[ -z "${AutoUpdate_Version}" ]] && AutoUpdate_Version="Unknown"
sed -i "s?Openwrt?Openwrt ${Openwrt_Version} / AutoUpdate ${AutoUpdate_Version}?g" package/base-files/files/etc/banner
echo "AutoUpdate Version: ${AutoUpdate_Version}"
else
sed -i "s?Openwrt?Openwrt ${Openwrt_Version}?g" package/base-files/files/etc/banner
fi
[[ -z "${Author}" ]] && Author="Unknown"
echo "Author: ${Author}" echo "Author: ${Author}"
echo "Openwrt Version: ${Openwrt_Version}" echo "Openwrt Version: ${Openwrt_Version}"
echo "AutoUpdate Version: ${AutoUpdate_Version}"
echo "Router: ${TARGET_PROFILE}" echo "Router: ${TARGET_PROFILE}"
echo "Github: ${Github_Repo}" echo "Github: ${Github_Repo}"
[ -f $Default_File ] && sed -i "s?${Lede_Version}?${Lede_Version} Compiled by ${Author} [${Display_Date}]?g" $Default_File [ -f $Default_File ] && sed -i "s?${Lede_Version}?${Lede_Version} Compiled by ${Author} [${Display_Date}]?g" $Default_File
echo "${Openwrt_Version}" > package/base-files/files/etc/openwrt_info echo "${Openwrt_Version}" > package/base-files/files/etc/openwrt_info
echo "${Github_Repo}" >> package/base-files/files/etc/openwrt_info echo "${Github_Repo}" >> package/base-files/files/etc/openwrt_info
echo "${TARGET_PROFILE}" >> package/base-files/files/etc/openwrt_info echo "${TARGET_PROFILE}" >> package/base-files/files/etc/openwrt_info
sed -i "s?Openwrt?Openwrt ${Openwrt_Version} / AutoUpdate ${AutoUpdate_Version}?g" package/base-files/files/etc/banner
} }
Diy_Part3_Base() { Diy_Part3_Base() {