From 26241e96086c0092318e54c3ee92574ed6a67a53 Mon Sep 17 00:00:00 2001
From: juewuy <juewuy@126.com>
Date: Mon, 6 Jun 2022 12:11:14 +0800
Subject: [PATCH] =?UTF-8?q?v1.6.3=20~=E8=87=AA=E5=8A=A8=E5=8A=A0=E8=BD=BD?=
 =?UTF-8?q?=E6=9C=AC=E6=9C=BAhosts=E5=8A=9F=E8=83=BD=EF=BC=8C=E4=B8=8D?=
 =?UTF-8?q?=E5=86=8D=E5=8A=A0=E8=BD=BDipv6=E5=9C=B0=E5=9D=80?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 scripts/clash.sh | 1 +
 scripts/start.sh | 6 ++----
 2 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/scripts/clash.sh b/scripts/clash.sh
index 5c3887b..26e96b2 100644
--- a/scripts/clash.sh
+++ b/scripts/clash.sh
@@ -1018,6 +1018,7 @@ clashadv(){
 		[ ! -f $clashdir/user.yaml ] && cat > $clashdir/user.yaml <<EOF
 #用于编写自定义设定(可参考https://lancellc.gitbook.io/clash)，例如
 #新版已经支持直接读取系统hosts(/etc/hosts)并写入配置文件，无需在此处添加！
+#新版meta内核已经支持yaml-v3，所有能在脚本中修改的条目请勿在此处配置以免报错！
 #port: 7890
 EOF
 		[ ! -f $clashdir/rules.yaml ] && cat > $clashdir/rules.yaml <<EOF
diff --git a/scripts/start.sh b/scripts/start.sh
index 603ecf2..9e428c4 100644
--- a/scripts/start.sh
+++ b/scripts/start.sh
@@ -286,7 +286,6 @@ modify_yaml(){
 	#默认fake-ip过滤列表
 	fake_ft_df='"*.lan", "time.windows.com", "time.nist.gov", "time.apple.com", "time.asia.apple.com", "*.ntp.org.cn", "*.openwrt.pool.ntp.org", "time1.cloud.tencent.com", "time.ustc.edu.cn", "pool.ntp.org", "ntp.ubuntu.com", "ntp.aliyun.com", "ntp1.aliyun.com", "ntp2.aliyun.com", "ntp3.aliyun.com", "ntp4.aliyun.com", "ntp5.aliyun.com", "ntp6.aliyun.com", "ntp7.aliyun.com", "time1.aliyun.com", "time2.aliyun.com", "time3.aliyun.com", "time4.aliyun.com", "time5.aliyun.com", "time6.aliyun.com", "time7.aliyun.com", "*.time.edu.cn", "time1.apple.com", "time2.apple.com", "time3.apple.com", "time4.apple.com", "time5.apple.com", "time6.apple.com", "time7.apple.com", "time1.google.com", "time2.google.com", "time3.google.com", "time4.google.com", "music.163.com", "*.music.163.com", "*.126.net", "musicapi.taihe.com", "music.taihe.com", "songsearch.kugou.com", "trackercdn.kugou.com", "*.kuwo.cn", "api-jooxtt.sanook.com", "api.joox.com", "joox.com", "y.qq.com", "*.y.qq.com", "streamoc.music.tc.qq.com", "mobileoc.music.tc.qq.com", "isure.stream.qqmusic.qq.com", "dl.stream.qqmusic.qq.com", "aqqmusic.tc.qq.com", "amobile.music.tc.qq.com", "*.xiami.com", "*.music.migu.cn", "music.migu.cn", "*.msftconnecttest.com", "*.msftncsi.com", "localhost.ptlogin2.qq.com", "*.*.*.srv.nintendo.net", "*.*.stun.playstation.net", "xbox.*.*.microsoft.com", "*.*.xboxlive.com", "proxy.golang.org","*.sgcc.com.cn","*.alicdn.com","*.aliyuncs.com"'
 	lan='allow-lan: true'
-	#mode='mode: Rule'
 	log='log-level: info'
 	[ "$ipv6_support" = "已开启" ] && ipv6='ipv6: true' || ipv6='ipv6: false'
 	[ "$ipv6_dns" = "已开启" ] && dns_v6='ipv6: true' || dns_v6=$ipv6
@@ -351,13 +350,12 @@ store-selected: $restore
 hosts:
 EOF
 ###################################
-	[ -f $clashdir/user.yaml ] && yaml_user=$clashdir/user.yaml
 	#读取本机hosts并生成配置文件
 	hosts_dir=/etc/hosts
 	if [ "$redir_mod" != "纯净模式" ] && [ "$dns_no" != "已禁用" ] && [ -f $hosts_dir ];then
 		while read line;do
-			[ -n "$(echo "$line")" ] && \
-			[ -z "$(echo "$line" | grep '#')" ] && \
+			[ -n "$(echo "$line" | grep -oE "([0-9]{1,3}[\.]){3}" )" ] && \
+			[ -z "$(echo "$line" | grep -oE '^#')" ] && \
 			hosts_ip=$(echo $line | awk '{print $1}')  && \
 			hosts_domain=$(echo $line | awk '{print $2}') && \
 			echo "   '$hosts_domain': $hosts_ip" >> $tmpdir/hosts.yaml