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

移动部分代码到 Function.sh

This commit is contained in:
Hyy2001X 2021-02-16 22:39:03 +08:00
parent a1d85aa4dd
commit 9d8762c482
2 changed files with 11 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Scripts/AutoBuild_DiyScript.sh
View File

@ -23,15 +23,14 @@ Diy_Core() {
Diy-Part1() { Diy-Part1() {
Diy_Part1_Base Diy_Part1_Base
Replace_File Customize/mac80211.sh package/kernel/mac80211/files/lib/wifi
if [ "${Default_Device}" == "d-team_newifi-d2" ];then if [ "${Default_Device}" == "d-team_newifi-d2" ];then
Replace_File Customize/system_newifi-d2 package/base-files/files/etc/config system Replace_File Customize/system_newifi-d2 package/base-files/files/etc/config system
else else
Replace_File Customize/system_common package/base-files/files/etc/config system Replace_File Customize/system_common package/base-files/files/etc/config system
fi fi
Replace_File Customize/banner package/base-files/files/etc
Update_Makefile exfat package/kernel/exfat Update_Makefile exfat package/kernel/exfat
Replace_File Customize/mt76-20210127.mk package/kernel/mt76 Makefile Replace_File Customize/mt76-20210127.mk package/kernel/mt76 Makefile
rm -rf package/kernel/mt76/patches rm -rf package/kernel/mt76/patches
@ -52,7 +51,6 @@ Diy-Part1() {
Diy-Part2() { Diy-Part2() {
Diy_Part2_Base Diy_Part2_Base
Replace_File Customize/mwan3.config package/feeds/packages/mwan3/files/etc/config mwan3
} }
Diy-Part3() { Diy-Part3() {

14
Scripts/AutoBuild_Function.sh
View File

@ -7,7 +7,7 @@ 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="Unknown"
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}"
@ -19,6 +19,8 @@ GET_TARGET_INFO() {
Diy_Part1_Base() { Diy_Part1_Base() {
Diy_Core Diy_Core
Mkdir package/lean Mkdir package/lean
[ -f "${GITHUB_WORKSPACE}/Customize/banner" ] && Replace_File Customize/banner package/base-files/files/etc
[ -f "${GITHUB_WORKSPACE}/Customize/mac80211.sh" ] && Replace_File Customize/mac80211.sh package/kernel/mac80211/files/lib/wifi
if [[ "${INCLUDE_SSR_Plus}" == "true" ]];then if [[ "${INCLUDE_SSR_Plus}" == "true" ]];then
ExtraPackages git lean helloworld https://github.com/fw876 master ExtraPackages git lean helloworld https://github.com/fw876 master
sed -i 's/143/143,25,5222/' package/lean/helloworld/luci-app-ssr-plus/root/etc/init.d/shadowsocksr sed -i 's/143/143,25,5222/' package/lean/helloworld/luci-app-ssr-plus/root/etc/init.d/shadowsocksr
@ -80,6 +82,7 @@ Diy_Part2_Base() {
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
[ -f "${GITHUB_WORKSPACE}/Customize/mwan3" ] && Replace_File Customize/mwan3.config package/feeds/packages/mwan3/files/etc/config mwan3
} }
Diy_Part3_Base() { Diy_Part3_Base() {
@ -123,8 +126,7 @@ ExtraPackages() {
git) git)
if [[ -z "${REPO_BRANCH}" ]];then if [[ -z "${REPO_BRANCH}" ]];then
echo "[$(date "+%H:%M:%S")] Missing important options,skip check out..." REPO_BRANCH="master"
break
fi fi
git clone -b ${REPO_BRANCH} ${REPO_URL}/${PKG_NAME} ${PKG_NAME} > /dev/null 2>&1 git clone -b ${REPO_BRANCH} ${REPO_URL}/${PKG_NAME} ${PKG_NAME} > /dev/null 2>&1
;; ;;
@ -172,9 +174,9 @@ Replace_File() {
} }
Update_Makefile() { Update_Makefile() {
PKG_NAME="$1" PKG_NAME=${1}
Makefile="$2/Makefile" Makefile=${2}/Makefile
[ -f /tmp/tmp_file ] && rm -f /tmp/tmp_file [ -f "/tmp/tmp_file" ] && rm -f /tmp/tmp_file
if [ -f "${Makefile}" ];then if [ -f "${Makefile}" ];then
PKG_URL_MAIN="$(grep "PKG_SOURCE_URL:=" ${Makefile} | cut -c17-100)" PKG_URL_MAIN="$(grep "PKG_SOURCE_URL:=" ${Makefile} | cut -c17-100)"
_process1=${PKG_URL_MAIN##*com/} _process1=${PKG_URL_MAIN##*com/}