From 090e5c082f271689333830d52ef34efd133bfdb5 Mon Sep 17 00:00:00 2001 From: John Doe Date: Sat, 16 Oct 2021 02:03:43 +0800 Subject: [PATCH] use my own ssrp --- scripts/merge_packages.sh | 1 + scripts/patches.sh | 9 --------- 2 files changed, 1 insertion(+), 9 deletions(-) diff --git a/scripts/merge_packages.sh b/scripts/merge_packages.sh index 83ea333..6f71713 100644 --- a/scripts/merge_packages.sh +++ b/scripts/merge_packages.sh @@ -25,6 +25,7 @@ function merge_feed(){ rm -rf package/custom; mkdir package/custom merge_feed nas "https://github.com/linkease/nas-packages;master" merge_feed nas_luci "https://github.com/linkease/nas-packages-luci;main" +merge_package https://github.com/klever1988/helloworld/trunk/luci-app-ssr-plus merge_package https://github.com/klever1988/openwrt-mos/trunk/luci-app-mosdns merge_package https://github.com/klever1988/openwrt-mos/trunk/mosdns merge_package https://github.com/project-lede/luci-app-godproxy diff --git a/scripts/patches.sh b/scripts/patches.sh index 32b8fc7..b3273c9 100644 --- a/scripts/patches.sh +++ b/scripts/patches.sh @@ -17,15 +17,6 @@ sed -i '/DEPENDS/ s/$/ +frpc/' `find package/ -follow -type f -path '*/luci-app- sed -i 's/ +ntfs-3g/ +ntfs3-mount/' `find package/ -follow -type f -path '*/automount/Makefile'` sed -i '/skip\=/ a skip=`mount | grep -q /dev/$device; echo $?`' `find package/ -follow -type f -path */automount/files/15-automount` -svn export https://github.com/klever1988/helloworld/trunk/luci-app-ssr-plus -dir_ssrp=`find package/ -follow -type d -path '*/luci-app-ssr-plus'` -cp luci-app-ssr-plus/root/etc/ssrplus/black.list ${dir_ssrp}/root/etc/ssrplus/black.list -cp luci-app-ssr-plus/root/etc/ssrplus/white.list ${dir_ssrp}/root/etc/ssrplus/white.list -cp luci-app-ssr-plus/root/etc/ssrplus/blockipv6.sh ${dir_ssrp}/root/etc/ssrplus/blockipv6.sh -cp luci-app-ssr-plus/root/etc/ssrplus/blackipv4.sh ${dir_ssrp}/root/etc/ssrplus/blackipv4.sh -cp luci-app-ssr-plus/root/usr/bin/ssr-rules ${dir_ssrp}/root/usr/bin/ssr-rules -rm -rf luci-app-ssr-plus/ - mkdir -p `find package/ -follow -type d -path '*/pdnsd-alt'`/patches mv $GITHUB_WORKSPACE/patches/99-disallow-aaaa.patch `find package/ -follow -type d -path '*/pdnsd-alt'`/patches