diff --git a/Scripts/AutoBuild_Function.sh b/Scripts/AutoBuild_Function.sh index fd03755..32301ff 100755 --- a/Scripts/AutoBuild_Function.sh +++ b/Scripts/AutoBuild_Function.sh @@ -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 }