diff --git a/bin/clashfm.tar.gz b/bin/clashfm.tar.gz index 4638108..fe9a1de 100644 Binary files a/bin/clashfm.tar.gz and b/bin/clashfm.tar.gz differ diff --git a/bin/version b/bin/version index 4365929..94f17f9 100644 --- a/bin/version +++ b/bin/version @@ -3,4 +3,4 @@ clashpre_v=2021.09.15 clash_v=v1.7.1 meta_v=alpha-eca7615 GeoIP_v=20220510 -versionsh=1.6.0pre2 +versionsh=1.6.0pre3 diff --git a/scripts/clash.sh b/scripts/clash.sh index 1e62511..ac2feb9 100644 --- a/scripts/clash.sh +++ b/scripts/clash.sh @@ -231,7 +231,7 @@ setport(){ setport elif [ "$num" = 8 ]; then echo ----------------------------------------------- - echo -e "\033[33m此处可以更改脚本内置的host地址\033[0m" + echo -e "\033[33m此处可以更改脚本内置的局域网设备IP地址\033[0m" echo -e "\033[31m设置后如本机host地址有变动,请务必手动修改!\033[0m" echo ----------------------------------------------- read -p "请输入自定义host地址(输入0移除自定义host) > " host diff --git a/scripts/start.sh b/scripts/start.sh index face67c..8b736a3 100644 --- a/scripts/start.sh +++ b/scripts/start.sh @@ -128,8 +128,10 @@ autoSSH(){ [ -f $clashdir/dropbear_rsa_host_key ] && ln -sf $clashdir/dropbear_rsa_host_key /etc/dropbear/dropbear_rsa_host_key } host_lan(){ - host_lan=$(ip a 2>&1 | grep -w 'inet' | grep 'global br-lan' | grep -oE '[1-9]\d{0,2}\.[1-9]\d{0,2}\.[1-9]\d{0,2}\.[1-9]\d{0,2}/[1-9]\d{0,1}' | head -n 1) - [ -n "$host_lan" ] && host_lan="-s ${host_lan}" + [ -n "$host" ] && host="$host/16" + [ -z "$host" ] && host=$(ip a 2>&1 | grep -w 'inet' | grep 'global br-lan' | grep -oE '[1-9]\d{0,2}\.[1-9]\d{0,2}\.[1-9]\d{0,2}\.[1-9]\d{0,2}/[1-9]\d{0,1}' | head -n 1) + [ -z "$host" ] && host=$(ip a 2>&1 | grep -w 'inet' | grep 'global' | grep -oE '[1-9]\d{0,2}\.[1-9]\d{0,2}\.[1-9]\d{0,2}\.[1-9]\d{0,2}/[1-9]\d{0,1}' | head -n 1) + [ -n "$host" ] && host_lan="-s ${host}" } #配置文件相关 getyaml(){