|
|
|
@ -8,6 +8,7 @@ git pull
|
|
|
|
|
echo '开始下载 easylist1...'
|
|
|
|
|
wget -O ./origin-files/easylistchina+easylist.txt --timeout 30 https://easylist-downloads.adblockplus.org/easylistchina+easylist.txt
|
|
|
|
|
|
|
|
|
|
# shellcheck disable=SC2181
|
|
|
|
|
if [ $? -ne 0 ];then
|
|
|
|
|
echo '下载失败,请重试'
|
|
|
|
|
exit 1
|
|
|
|
@ -16,6 +17,7 @@ fi
|
|
|
|
|
echo '开始下载 easylist2...'
|
|
|
|
|
wget -O ./origin-files/cjx-annoyance.txt --timeout 30 https://raw.githubusercontent.com/cjx82630/cjxlist/master/cjx-annoyance.txt
|
|
|
|
|
|
|
|
|
|
# shellcheck disable=SC2181
|
|
|
|
|
if [ $? -ne 0 ];then
|
|
|
|
|
echo '下载失败,请重试'
|
|
|
|
|
exit 1
|
|
|
|
@ -24,6 +26,7 @@ fi
|
|
|
|
|
echo '开始下载 easylist3...'
|
|
|
|
|
wget -O ./origin-files/fanboy-annoyance.txt --timeout 30 https://easylist.to/easylist/fanboy-annoyance.txt
|
|
|
|
|
|
|
|
|
|
# shellcheck disable=SC2181
|
|
|
|
|
if [ $? -ne 0 ];then
|
|
|
|
|
echo '下载失败,请重试'
|
|
|
|
|
exit 1
|
|
|
|
@ -33,6 +36,7 @@ fi
|
|
|
|
|
echo '开始下载 hosts1...'
|
|
|
|
|
wget -O ./origin-files/hosts1 --timeout 30 https://hosts.nfz.moe/full/hosts
|
|
|
|
|
|
|
|
|
|
# shellcheck disable=SC2181
|
|
|
|
|
if [ $? -ne 0 ];then
|
|
|
|
|
echo '下载失败,请重试'
|
|
|
|
|
exit 1
|
|
|
|
@ -41,6 +45,7 @@ fi
|
|
|
|
|
echo '开始下载 hosts2...'
|
|
|
|
|
wget -O ./origin-files/hosts2 --timeout 60 https://raw.githubusercontent.com/vokins/yhosts/master/hosts
|
|
|
|
|
|
|
|
|
|
# shellcheck disable=SC2181
|
|
|
|
|
if [ $? -ne 0 ];then
|
|
|
|
|
echo '下载失败,请重试'
|
|
|
|
|
exit 1
|
|
|
|
@ -49,6 +54,7 @@ fi
|
|
|
|
|
echo '开始下载 hosts3...'
|
|
|
|
|
wget -O ./origin-files/hosts3 --timeout 60 https://raw.githubusercontent.com/jdlingyu/ad-wars/master/hosts
|
|
|
|
|
|
|
|
|
|
# shellcheck disable=SC2181
|
|
|
|
|
if [ $? -ne 0 ];then
|
|
|
|
|
echo '下载失败,请重试'
|
|
|
|
|
exit 1
|
|
|
|
@ -57,6 +63,6 @@ fi
|
|
|
|
|
|
|
|
|
|
PHP_RET=$(/usr/local/php/bin/php make-addr.php)
|
|
|
|
|
|
|
|
|
|
git add -A adblock-for-dnsmasq.conf hosts1 hosts2 host3 *.txt
|
|
|
|
|
git add -A adblock-for-dnsmasq.conf origin-files/*
|
|
|
|
|
git commit -am "auto commit. script output--- $PHP_RET"
|
|
|
|
|
git push --force
|
|
|
|
|