From c42dce5ed3e5285d19c0f90fc755cd89d24093af Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Mon, 24 Apr 2023 23:35:42 +0800 Subject: [PATCH] update 2023-04-24 23:35:42 --- luci-app-cloudflarespeedtest/Makefile | 2 +- .../usr/bin/cloudflarespeedtest/cloudflarespeedtest.sh | 9 ++++++--- 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/luci-app-cloudflarespeedtest/Makefile b/luci-app-cloudflarespeedtest/Makefile index 9c1b7f1eb..ea1d672f3 100644 --- a/luci-app-cloudflarespeedtest/Makefile +++ b/luci-app-cloudflarespeedtest/Makefile @@ -10,7 +10,7 @@ PKG_NAME:=luci-app-cloudflarespeedtest LUCI_TITLE:=LuCI support for Cloudflares Speed Test LUCI_DEPENDS:=+cdnspeedtest +openssl-util +curl LUCI_PKGARCH:=all -PKG_VERSION:=1.5.1 +PKG_VERSION:=1.5.2 PKG_RELEASE:=0 PKG_LICENSE:=AGPL-3.0 PKG_MAINTAINER:=mingxiaoyu diff --git a/luci-app-cloudflarespeedtest/root/usr/bin/cloudflarespeedtest/cloudflarespeedtest.sh b/luci-app-cloudflarespeedtest/root/usr/bin/cloudflarespeedtest/cloudflarespeedtest.sh index cf2ec29e0..1147a2a2a 100644 --- a/luci-app-cloudflarespeedtest/root/usr/bin/cloudflarespeedtest/cloudflarespeedtest.sh +++ b/luci-app-cloudflarespeedtest/root/usr/bin/cloudflarespeedtest/cloudflarespeedtest.sh @@ -158,10 +158,13 @@ function ip_replace(){ function host_ip() { if [ "x${HOST_enabled}" == "x1" ] ;then get_servers_config "host_domain" - HOSTS_LINE="$bestip $host_domain" - if [ -n "$(grep $host_domain /etc/hosts)" ] + HOSTS_LINE=$(echo "$host_domain" | sed 's/,/ /g' | sed "s/^/$bestip /g") + host_domain_first=$(echo "$host_domain" | awk -F, '{print $1}') + + if [ -n "$(grep $host_domain_first /etc/hosts)" ] then - sed -i".bak" "/$host_domain/d" /etc/hosts + echo $host_domain_first + sed -i".bak" "/$host_domain_first/d" /etc/hosts echo $HOSTS_LINE >> /etc/hosts; else echo $HOSTS_LINE >> /etc/hosts;