From 06f2169daf7174b401736769eaae4413b6338a26 Mon Sep 17 00:00:00 2001 From: root Date: Thu, 17 Sep 2020 18:17:54 +0800 Subject: [PATCH] re-write scripts --- .github/workflows/r1s_lean.yml | 12 ++---------- .github/workflows/r1s_lean_h3.yml | 12 ++---------- .github/workflows/r2s_lean.yml | 13 ++----------- .github/workflows/r2s_lean_minimal-dev.yml | 10 ++-------- .github/workflows/r2s_lean_minimal.yml | 9 +-------- 3_prepare_packages.sh | 16 ++++++++-------- 5_mods.sh | 7 +++++++ 7 files changed, 24 insertions(+), 55 deletions(-) create mode 100644 5_mods.sh diff --git a/.github/workflows/r1s_lean.yml b/.github/workflows/r1s_lean.yml index 96fdce6..d196ab8 100644 --- a/.github/workflows/r1s_lean.yml +++ b/.github/workflows/r1s_lean.yml @@ -35,7 +35,6 @@ jobs: cd friendlywrt-h5 . ../remove_unused_config.sh cat ../app_config.seed >> configs/config_h5 - echo '# CONFIG_V2RAY_COMPRESS_UPX is not set' >> configs/config_h5 cd friendlywrt git remote add upstream https://github.com/coolsnowwolf/openwrt && git fetch upstream git checkout upstream/lede-17.01 -b tmp @@ -45,19 +44,12 @@ jobs: git checkout master git rebase 90bb1cf9c33e73de5019686b8bd495f689e675a4^ --onto tmp -X theirs rm -f target/linux/allwinner-h5/patches-4.14/0001-net-thunderx-workaround-BGX-TX-Underflow-issue.patch target/linux/generic/hack-4.14/999-net-patch-linux-kernel-to-support-shortcut-fe.patch - git checkout upstream/lede-17.01 -- feeds.conf.default - sed -i -E 's/#(src-git.+)(helloworld.+)/\1\2/' feeds.conf.default + git checkout upstream/lede-17.01 -- feeds.conf.default && sed -i -E 's/#(src-git.+)(helloworld.+)/\1\2/' feeds.conf.default cd package/lean/ - rm -rf luci-theme-argon . ../../../../3_prepare_packages.sh cd ../../ git apply ../../enable_autocore.diff - sed -i '/uci commit luci/i\uci set luci.main.mediaurlbase="/luci-static/argon"' package/lean/default-settings/files/zzz-default-settings - sed -i '/exit/i\chown -R root:root /usr/share/netdata/web' package/lean/default-settings/files/zzz-default-settings - sed -i '/exit/i\find /etc/rc.d/ -name *docker* -delete' package/lean/default-settings/files/zzz-default-settings - sed -i 's/option fullcone\t1/option fullcone\t0/' package/network/config/firewall/files/firewall.config - sed -i '/8.8.8.8/d' package/base-files/files/root/setup.sh - echo -e '\nDYC Build\n' >> package/base-files/files/etc/banner + . ../../5_mods.sh - name: Build FriendlyWrt run: . 4_build_image.sh friendlywrt-h5 nanopi_r1s.mk diff --git a/.github/workflows/r1s_lean_h3.yml b/.github/workflows/r1s_lean_h3.yml index 34e51f8..55850e3 100644 --- a/.github/workflows/r1s_lean_h3.yml +++ b/.github/workflows/r1s_lean_h3.yml @@ -37,7 +37,6 @@ jobs: sed -i '/CONFIG_TARGET_DEVICE/d' configs/config_h3 . ../remove_unused_config.sh cat ../app_config.seed >> configs/config_h3 - echo '# CONFIG_V2RAY_COMPRESS_UPX is not set' >> configs/config_h3 cd friendlywrt git remote add upstream https://github.com/coolsnowwolf/openwrt && git fetch upstream git checkout upstream/lede-17.01 -b tmp @@ -47,19 +46,12 @@ jobs: git checkout master-v19.07.1 git rebase adc1a9a3676b8d7be1b48b5aed185a94d8e42728^ --onto tmp -X theirs rm -f target/linux/allwinner-h5/patches-4.14/0001-net-thunderx-workaround-BGX-TX-Underflow-issue.patch target/linux/generic/hack-4.14/999-net-patch-linux-kernel-to-support-shortcut-fe.patch - git checkout upstream/lede-17.01 -- feeds.conf.default - sed -i -E 's/#(src-git.+)(helloworld.+)/\1\2/' feeds.conf.default + git checkout upstream/lede-17.01 -- feeds.conf.default && sed -i -E 's/#(src-git.+)(helloworld.+)/\1\2/' feeds.conf.default cd package/lean/ - rm -rf luci-theme-argon . ../../../../3_prepare_packages.sh cd ../../ git apply ../../enable_autocore.diff - sed -i '/uci commit luci/i\uci set luci.main.mediaurlbase="/luci-static/argon"' package/lean/default-settings/files/zzz-default-settings - sed -i '/exit/i\chown -R root:root /usr/share/netdata/web' package/lean/default-settings/files/zzz-default-settings - sed -i '/exit/i\find /etc/rc.d/ -name *docker* -delete' package/lean/default-settings/files/zzz-default-settings - sed -i 's/option fullcone\t1/option fullcone\t0/' package/network/config/firewall/files/firewall.config - sed -i '/8.8.8.8/d' package/base-files/files/root/setup.sh - echo -e '\nDYC Build\n' >> package/base-files/files/etc/banner + . ../../5_mods.sh - name: Build FriendlyWrt run: . 4_build_image.sh friendlywrt-h3 nanopi_r1s_h3.mk diff --git a/.github/workflows/r2s_lean.yml b/.github/workflows/r2s_lean.yml index 5065ccc..0ba9f71 100644 --- a/.github/workflows/r2s_lean.yml +++ b/.github/workflows/r2s_lean.yml @@ -40,32 +40,23 @@ jobs: cat configs/config_rk3328 | grep "TARGET" >> ../base_rk3328.seed cat ../app_config.seed >> ../base_rk3328.seed cat ../base_rk3328.seed > configs/config_rk3328 - echo '# CONFIG_V2RAY_COMPRESS_UPX is not set' >> configs/config_rk3328 cd friendlywrt git remote add upstream https://github.com/coolsnowwolf/openwrt && git fetch upstream git checkout upstream/lede-17.01 -b tmp - #git checkout 33f7cb735300bd9a099995236ed768c8925fec75 -- target/linux/sunxi/image/ git rm README.md git commit -m 'reset' git checkout master-v19.07.1 git rebase adc1a9a3676b8d7be1b48b5aed185a94d8e42728^ --onto tmp -X theirs rm -f target/linux/rockchip-rk3328/patches-4.14/0001-net-thunderx-workaround-BGX-TX-Underflow-issue.patch target/linux/generic/hack-4.14/999-net-patch-linux-kernel-to-support-shortcut-fe.patch - git checkout upstream/lede-17.01 -- feeds.conf.default - sed -i -E 's/#(src-git.+)(helloworld.+)/\1\2/' feeds.conf.default + git checkout upstream/lede-17.01 -- feeds.conf.default && sed -i -E 's/#(src-git.+)(helloworld.+)/\1\2/' feeds.conf.default cd package/lean/ - rm -rf luci-theme-argon . ../../../../3_prepare_packages.sh cd ../../ git apply ../../enable_autocore.diff sed -i 's/@LINUX_5_4//' package/lean/luci-app-flowoffload/Makefile - sed -i '/uci commit luci/i\uci set luci.main.mediaurlbase="/luci-static/argon"' package/lean/default-settings/files/zzz-default-settings - sed -i '/exit/i\chown -R root:root /usr/share/netdata/web' package/lean/default-settings/files/zzz-default-settings - sed -i '/exit/i\find /etc/rc.d/ -name *docker* -delete' package/lean/default-settings/files/zzz-default-settings - sed -i 's/option fullcone\t1/option fullcone\t0/' package/network/config/firewall/files/firewall.config - sed -i '/8.8.8.8/d' package/base-files/files/root/setup.sh + . ../../5_mods.sh mv ../../scripts/check_wan4.sh package/base-files/files/usr/bin && sed -i '/exit/i\/bin/sh /usr/bin/check_wan4.sh &' package/base-files/files/etc/rc.local mv ../../scripts/autoupdate.sh package/base-files/files/root/au.sh && chmod +x package/base-files/files/root/au.sh - echo -e '\nDYC Build\n' >> package/base-files/files/etc/banner - name: Build FriendlyWrt run: . 4_build_image.sh friendlywrt-rk3328 nanopi_r2s.mk diff --git a/.github/workflows/r2s_lean_minimal-dev.yml b/.github/workflows/r2s_lean_minimal-dev.yml index 2db5320..0a0f423 100644 --- a/.github/workflows/r2s_lean_minimal-dev.yml +++ b/.github/workflows/r2s_lean_minimal-dev.yml @@ -40,7 +40,6 @@ jobs: cat configs/config_rk3328 | grep "TARGET" >> ../base_rk3328.seed cat ../minimal_config.seed >> ../base_rk3328.seed cat ../base_rk3328.seed > configs/config_rk3328 - cd friendlywrt git remote add upstream https://github.com/project-openwrt/openwrt && git fetch upstream git checkout upstream/openwrt-18.06 -b tmp @@ -51,17 +50,12 @@ jobs: rm -f target/linux/rockchip-rk3328/patches-4.14/0001-net-thunderx-workaround-BGX-TX-Underflow-issue.patch git checkout upstream/openwrt-18.06 -- feeds.conf.default cd package/ctcgfw/ - rm -rf luci-app-oled/ && git clone https://github.com/NateLol/luci-app-oled + . ../../../../3_prepare_packages.sh cd ../../ git apply ../../enable_autocore_ctcgfw_master.diff - sed -i '/uci commit luci/i\uci set luci.main.mediaurlbase="/luci-static/argon"' package/lean/default-settings/files/zzz-default-settings - sed -i '/exit/i\chown -R root:root /usr/share/netdata/web' package/lean/default-settings/files/zzz-default-settings - sed -i '/exit/i\find /etc/rc.d/ -name *docker* -delete' package/lean/default-settings/files/zzz-default-settings - sed -i 's/option fullcone\t1/option fullcone\t0/' package/network/config/firewall/files/firewall.config - sed -i '/8.8.8.8/d' package/base-files/files/root/setup.sh + . ../../5_mods.sh mv ../../scripts/check_wan4.sh package/base-files/files/usr/bin && sed -i '/exit/i\/bin/sh /usr/bin/check_wan4.sh &' package/base-files/files/etc/rc.local mv ../../scripts/autoupdate.sh package/base-files/files/root/au.sh && chmod +x package/base-files/files/root/au.sh - echo -e '\nDYC Build\n' >> package/base-files/files/etc/banner - name: Add OpenClash Core run: | diff --git a/.github/workflows/r2s_lean_minimal.yml b/.github/workflows/r2s_lean_minimal.yml index 99e0984..82cbbec 100644 --- a/.github/workflows/r2s_lean_minimal.yml +++ b/.github/workflows/r2s_lean_minimal.yml @@ -40,7 +40,6 @@ jobs: cat configs/config_rk3328 | grep "TARGET" >> ../base_rk3328.seed cat ../minimal_config.seed >> ../base_rk3328.seed cat ../base_rk3328.seed > configs/config_rk3328 - cd friendlywrt git remote add upstream https://github.com/coolsnowwolf/openwrt && git fetch upstream git checkout upstream/lede-17.01 -b tmp @@ -51,19 +50,13 @@ jobs: rm -f target/linux/rockchip-rk3328/patches-4.14/0001-net-thunderx-workaround-BGX-TX-Underflow-issue.patch target/linux/generic/hack-4.14/999-net-patch-linux-kernel-to-support-shortcut-fe.patch git checkout upstream/lede-17.01 -- feeds.conf.default && sed -i -E 's/#(src-git.+)(helloworld.+)/\1\2/' feeds.conf.default cd package/lean/ - rm -rf luci-theme-argon . ../../../../3_prepare_packages.sh cd ../../ git apply ../../enable_autocore.diff sed -i 's/@LINUX_5_4//' package/lean/luci-app-flowoffload/Makefile - sed -i '/uci commit luci/i\uci set luci.main.mediaurlbase="/luci-static/argon"' package/lean/default-settings/files/zzz-default-settings - sed -i '/exit/i\chown -R root:root /usr/share/netdata/web' package/lean/default-settings/files/zzz-default-settings - sed -i '/exit/i\find /etc/rc.d/ -name *docker* -delete' package/lean/default-settings/files/zzz-default-settings - sed -i 's/option fullcone\t1/option fullcone\t0/' package/network/config/firewall/files/firewall.config - sed -i '/8.8.8.8/d' package/base-files/files/root/setup.sh + . ../../5_mods.sh mv ../../scripts/check_wan4.sh package/base-files/files/usr/bin && sed -i '/exit/i\/bin/sh /usr/bin/check_wan4.sh &' package/base-files/files/etc/rc.local mv ../../scripts/autoupdate.sh package/base-files/files/root/au.sh && chmod +x package/base-files/files/root/au.sh - echo -e '\nDYC Build\n' >> package/base-files/files/etc/banner - name: Add OpenClash run: . add_openclash.sh diff --git a/3_prepare_packages.sh b/3_prepare_packages.sh index 4d62663..a351198 100644 --- a/3_prepare_packages.sh +++ b/3_prepare_packages.sh @@ -1,13 +1,13 @@ if [[ `pwd` == *"rk3328"* ]]; then - git clone https://github.com/NateLol/luci-app-oled + rm -rf luci-app-oled/ && git clone https://github.com/NateLol/luci-app-oled fi -git clone https://github.com/destan19/OpenAppFilter -git clone https://github.com/rufengsuixing/luci-app-adguardhome -git clone -b 18.06 https://github.com/jerrykuku/luci-theme-argon -git clone -b 18.06 https://github.com/garypang13/luci-theme-edge -git clone https://github.com/xiaoqingfengATGH/luci-theme-infinityfreedom -git clone https://github.com/pexcn/openwrt-chinadns-ng chinadns-ng -git clone https://github.com/WuSiYu/luci-app-chinadns-ng +rm -rf oaf/ && git clone https://github.com/destan19/OpenAppFilter oaf +rm -rf luci-app-adguardhome/ && git clone https://github.com/rufengsuixing/luci-app-adguardhome +rm -rf luci-theme-argon/ && git clone -b 18.06 https://github.com/jerrykuku/luci-theme-argon +rm -rf luci-theme-edge/ && git clone -b 18.06 https://github.com/garypang13/luci-theme-edge +rm -rf luci-theme-infinityfreedom/ && git clone https://github.com/xiaoqingfengATGH/luci-theme-infinityfreedom +rm -rf chinadns-ng/ && git clone https://github.com/pexcn/openwrt-chinadns-ng chinadns-ng +rm -rf luci-app-chinadns-ng/ && git clone https://github.com/WuSiYu/luci-app-chinadns-ng #git clone https://github.com/jerrykuku/lua-maxminddb.git #git clone https://github.com/jerrykuku/luci-app-vssr.git diff --git a/5_mods.sh b/5_mods.sh new file mode 100644 index 0000000..00dcb4f --- /dev/null +++ b/5_mods.sh @@ -0,0 +1,7 @@ +sed -i '/uci commit luci/i\uci set luci.main.mediaurlbase="/luci-static/argon"' package/lean/default-settings/files/zzz-default-settings +sed -i '/exit/i\chown -R root:root /usr/share/netdata/web' package/lean/default-settings/files/zzz-default-settings +sed -i '/exit/i\find /etc/rc.d/ -name *docker* -delete' package/lean/default-settings/files/zzz-default-settings +sed -i 's/option fullcone\t1/option fullcone\t0/' package/network/config/firewall/files/firewall.config +sed -i '/find.*wlan.*wc/a\WIFI_NUM=0' package/base-files/files/root/setup.sh +sed -i '/8.8.8.8/d' package/base-files/files/root/setup.sh +echo -e '\nDYC Build\n' >> package/base-files/files/etc/banner \ No newline at end of file