zhao/luci-app-mosdns
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

luci-app-mosdns: mosdns.sh: fix execution sequence

Browse Source 
Signed-off-by: sbwml <admin@cooluc.com>
This commit is contained in:
Bard 2023-11-15 22:28:55 +08:00 committed by sbwml
parent e79a991d75
commit ed09f893ac
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
luci-app-mosdns/root/usr/share/mosdns/mosdns.sh
View File

@ -62,6 +62,7 @@ adlist_update() {
for url in $ad_source; for url in $ad_source;
do do
if [ "$url" != "geosite.dat" ] && [ $(echo "$url" | grep -c -E "^file://") -eq 0 ]; then if [ "$url" != "geosite.dat" ] && [ $(echo "$url" | grep -c -E "^file://") -eq 0 ]; then
has_update=1
echo "$url" >> /etc/mosdns/rule/.ad_source echo "$url" >> /etc/mosdns/rule/.ad_source
filename=$(basename $url) filename=$(basename $url)
if echo "$url" | grep -Eq "^https://raw.githubusercontent.com" ; then if echo "$url" | grep -Eq "^https://raw.githubusercontent.com" ; then
@ -69,7 +70,6 @@ adlist_update() {
fi fi
echo -e "\e[1;32mDownloading $mirror$url\e[0m" echo -e "\e[1;32mDownloading $mirror$url\e[0m"
curl --connect-timeout 5 -m 90 --ipv4 -kfSLo "$AD_TMPDIR/$filename" "$mirror$url" curl --connect-timeout 5 -m 90 --ipv4 -kfSLo "$AD_TMPDIR/$filename" "$mirror$url"
has_update=1
fi fi
done done
if [ $? -ne 0 ]; then if [ $? -ne 0 ]; then
@ -81,9 +81,9 @@ adlist_update() {
mkdir -p /etc/mosdns/rule/adlist mkdir -p /etc/mosdns/rule/adlist
rm -rf /etc/mosdns/rule/adlist/* rm -rf /etc/mosdns/rule/adlist/*
\cp $AD_TMPDIR/* /etc/mosdns/rule/adlist \cp $AD_TMPDIR/* /etc/mosdns/rule/adlist
rm -rf "$AD_TMPDIR"
} }
fi fi
rm -rf "$AD_TMPDIR"
} }
geodat_update() ( geodat_update() (