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

新增 Passwall AutoBuild_Tools.sh 启用开关

This commit is contained in:
Hyy2001X 2021-01-16 15:59:00 +08:00
parent 2ea79ba2fc
commit b0b926c7d4
2 changed files with 9 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Scripts/AutoBuild_DiyScript.sh
View File

@ -8,7 +8,9 @@ Diy_Core() {
Default_Device=d-team_newifi-d2 Default_Device=d-team_newifi-d2
INCLUDE_AutoUpdate=true INCLUDE_AutoUpdate=true
INCLUDE_AutoBuild_Tools=true
INCLUDE_SSR_Plus=true INCLUDE_SSR_Plus=true
INCLUDE_Passwall=false
INCLUDE_Latest_Ray=true INCLUDE_Latest_Ray=true
} }

9
Scripts/AutoBuild_Function.sh
View File

@ -28,7 +28,12 @@ Diy_Part1_Base() {
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
fi fi
Replace_File Scripts/AutoBuild_Tools.sh package/base-files/files/bin if [ "${INCLUDE_AutoBuild_Tools}" == "true" ];then
Replace_File Scripts/AutoBuild_Tools.sh package/base-files/files/bin
fi
if [ "${INCLUDE_Passwall}" == "true" ];then
ExtraPackages git lienol openwrt-passwall https://github.com/xiaorouji main
fi
} }
Diy_Part2_Base() { Diy_Part2_Base() {
@ -111,7 +116,7 @@ ExtraPackages() {
break break
;; ;;
esac esac
if [ -f ${PKG_NAME}/Makefile ] || [ -f ${PKG_NAME}/README* ];then if [ "$?" -eq 0 ] || [ -f ${PKG_NAME}/Makefile ] || [ -f ${PKG_NAME}/README* ] || [ ! "$(ls -A ${PKG_NAME})" = "" ];then
echo "[$(date "+%H:%M:%S")] Package [${PKG_NAME}] is detected!" echo "[$(date "+%H:%M:%S")] Package [${PKG_NAME}] is detected!"
mv -f ${PKG_NAME} package/${PKG_DIR} mv -f ${PKG_NAME} package/${PKG_DIR}
break break