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-07 19:47:41 +08:00
parent 91e27789db
commit a0bf05a075
2 changed files with 9 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Scripts/AutoBuild_DiyScript.sh
View File

@ -5,7 +5,7 @@
Diy_Core() { Diy_Core() {
Author=Hyy2001 Author=Hyy2001
Default_Device=d-team_newifi-d2 Default_Device=
INCLUDE_AutoUpdate=true INCLUDE_AutoUpdate=true
INCLUDE_AutoBuild_Tools=true INCLUDE_AutoBuild_Tools=true
@ -18,6 +18,7 @@ Diy_Core() {
INCLUDE_Bypass=false INCLUDE_Bypass=false
INCLUDE_OpenClash=true INCLUDE_OpenClash=true
INCLUDE_OAF=false INCLUDE_OAF=false
INCLUDE_Argon=true
} }
Diy-Part1() { Diy-Part1() {
@ -29,7 +30,6 @@ Diy-Part1() {
Update_Makefile xray-core package/lean/helloworld/xray-core Update_Makefile xray-core package/lean/helloworld/xray-core
Update_Makefile exfat package/kernel/exfat Update_Makefile exfat package/kernel/exfat
ExtraPackages git lean luci-theme-argon https://github.com/jerrykuku 18.06
ExtraPackages git other luci-app-argon-config https://github.com/jerrykuku ExtraPackages git other luci-app-argon-config https://github.com/jerrykuku
ExtraPackages git other luci-app-adguardhome https://github.com/Hyy2001X ExtraPackages git other luci-app-adguardhome https://github.com/Hyy2001X
ExtraPackages git other luci-app-shutdown https://github.com/Hyy2001X ExtraPackages git other luci-app-shutdown https://github.com/Hyy2001X

7
Scripts/AutoBuild_Function.sh
View File

@ -80,6 +80,13 @@ Diy_Part2_Base() {
Replace_File Customize/uhttpd.po feeds/luci/applications/luci-app-uhttpd/po/zh-cn Replace_File Customize/uhttpd.po feeds/luci/applications/luci-app-uhttpd/po/zh-cn
Replace_File Customize/webadmin.po package/lean/luci-app-webadmin/po/zh-cn Replace_File Customize/webadmin.po package/lean/luci-app-webadmin/po/zh-cn
Replace_File Customize/mwan3.config package/feeds/packages/mwan3/files/etc/config mwan3 Replace_File Customize/mwan3.config package/feeds/packages/mwan3/files/etc/config mwan3
if [[ "${INCLUDE_Argon}" == "true" ]];then
if [ -f "${Default_File}" ];then
ExtraPackages git lean luci-theme-argon https://github.com/jerrykuku 18.06
else
ExtraPackages git other luci-theme-argon https://github.com/jerrykuku
fi
fi
if [[ "${INCLUDE_DRM_I915}" == "true" ]];then if [[ "${INCLUDE_DRM_I915}" == "true" ]];then
Replace_File Customize/config-5.4 target/linux/x86 Replace_File Customize/config-5.4 target/linux/x86
fi fi