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-03-27 08:01:48 +08:00 committed by GitHub
parent cc4386a701
commit 0d95954442
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Scripts/AutoBuild_Function.sh
View File

@ -8,7 +8,7 @@ GET_TARGET_INFO() {
Home=${GITHUB_WORKSPACE}/openwrt Home=${GITHUB_WORKSPACE}/openwrt
[ -f ${GITHUB_WORKSPACE}/Openwrt.info ] && . ${GITHUB_WORKSPACE}/Openwrt.info [ -f ${GITHUB_WORKSPACE}/Openwrt.info ] && . ${GITHUB_WORKSPACE}/Openwrt.info
Owner_Repo="$(grep "https://github.com/[a-zA-Z0-9]" ${GITHUB_WORKSPACE}/.git/config | cut -c8-100)" Owner_Repo="$(grep "https://github.com/[a-zA-Z0-9]" ${GITHUB_WORKSPACE}/.git/config | cut -c8-100)"
AB_Firmware_Info=${GITHUB_WORKSPACE}/openwrt/package/base-files/files/etc/openwrt_info AB_Firmware_Info=package/base-files/files/etc/openwrt_info
Source_Repo="$(grep "https://github.com/[a-zA-Z0-9]" ${Home}/.git/config | cut -c8-100)" Source_Repo="$(grep "https://github.com/[a-zA-Z0-9]" ${Home}/.git/config | cut -c8-100)"
Source_Owner="$(echo "${Source_Repo}" | egrep -o "[a-z]+" | awk 'NR==4')" Source_Owner="$(echo "${Source_Repo}" | egrep -o "[a-z]+" | awk 'NR==4')"
case ${Source_Owner} in case ${Source_Owner} in
@ -61,6 +61,7 @@ Diy_Part1_Base() {
Diy_Part2_Base() { Diy_Part2_Base() {
GET_TARGET_INFO GET_TARGET_INFO
Auto_ExtraPackages Auto_ExtraPackages
Replace_File CustomFiles/Depends/banner package/base-files/files/etc
if [[ "${INCLUDE_AutoUpdate}" == "true" ]];then if [[ "${INCLUDE_AutoUpdate}" == "true" ]];then
ExtraPackages git lean luci-app-autoupdate https://github.com/Hyy2001X main ExtraPackages git lean luci-app-autoupdate https://github.com/Hyy2001X main
Replace_File Scripts/AutoUpdate.sh package/base-files/files/bin Replace_File Scripts/AutoUpdate.sh package/base-files/files/bin
@ -69,7 +70,6 @@ Diy_Part2_Base() {
else else
sed -i "s?Openwrt?Openwrt ${Openwrt_Version}?g" package/base-files/files/etc/banner sed -i "s?Openwrt?Openwrt ${Openwrt_Version}?g" package/base-files/files/etc/banner
fi fi
Replace_File CustomFiles/Depends/banner package/base-files/files/etc
Replace_File CustomFiles/Depends/cpuinfo_x86 package/lean/autocore/files/x86/sbin cpuinfo Replace_File CustomFiles/Depends/cpuinfo_x86 package/lean/autocore/files/x86/sbin cpuinfo
case ${Source_Owner} in case ${Source_Owner} in
coolsnowwolf) coolsnowwolf)