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

AddPackage_List_Common 添加 '## DO NOT MERGE' 控制

This commit is contained in:
Hyy2001X 2021-06-24 20:40:10 +08:00
parent 39cb782d6d
commit 57c012f800
1 changed files with 1 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Scripts/AutoBuild_Function.sh
View File

@ -161,7 +161,7 @@ Firmware-Diy_Base() {
mkdir -p package/base-files/files/etc/AutoBuild
[ -f VARIABLE_FILE_Main ] && cp VARIABLE_FILE_Main package/base-files/files/etc/AutoBuild/Default_Variable
Copy CustomFiles/Depends/Custom_Variable package/base-files/files/etc/AutoBuild
AddPackage_List ${GITHUB_WORKSPACE}/CustomPackages/Common
[[ ! "$(cat .config)" =~ "## DO NOT MERGE" ]] && AddPackage_List ${GITHUB_WORKSPACE}/CustomPackages/Common
AddPackage_List ${GITHUB_WORKSPACE}/CustomPackages/${TARGET_PROFILE}
chmod +x -R ${GITHUB_WORKSPACE}/Scripts
chmod 777 -R ${GITHUB_WORKSPACE}/CustomFiles
@ -229,7 +229,6 @@ Firmware-Diy_Base() {
AddPackage git other helloworld fw876 master
sed -i 's/143/143,8080/' $(PKG_Finder d package luci-app-ssr-plus)/root/etc/init.d/shadowsocksr
sed -i "s?iptables?#iptables?g" ${Version_File}
sed -i "s?ip6tables -t?#ip6tables -t?g" ${Version_File}
sed -i "s?${Old_Version}?${Old_Version} @ ${Author} [${Display_Date}]?g" ${Version_File}
;;
immortalwrt)
@ -387,7 +386,6 @@ AddPackage_List() {
[[ -s $1 ]] && {
TIME "Loading Custom Packages list: [$1]..."
cat $1 | sed '/^$/d' | while read X;do
[[ $* =~ "#" ]] && TIME "Skip check out: ${X}"
[[ -n ${X} && ! $* =~ "#" ]] && AddPackage ${X}
done
}