github
/
v2ray-agent
mirror of https://github.com/mack-a/v2ray-agent
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

feat(脚本): 修改ip检测方法、修改软连接检测方法

pull/534/merge
mack-a 2021-01-22 16:25:33 +08:00
parent c87f1892f8
commit cb464104fa
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
install.sh
View File

@ -538,10 +538,10 @@ EOF
# 检查ip # 检查ip
checkIP() { checkIP() {
echoContent skyBlue " ---> 检查ipv4中" echoContent skyBlue " ---> 检查ipv4中"
pingIP=$(ping -c 1 -W 1000 ${domain} | sed '1{s/[^(]*(//;s/).*//;q;}') pingIP=$(ping -c 1 -W 1000 ${domain} | sed '2{s/[^(]*(//;s/).*//;q;}' | sed -n '$p')
if [[ -z $(echo "${pingIP}" | awk -F "[.]" '{print $4}') ]]; then if [[ -z $(echo "${pingIP}" | awk -F "[.]" '{print $4}') ]]; then
echoContent skyBlue " ---> 检查ipv6中" echoContent skyBlue " ---> 检查ipv6中"
pingIP=$(ping6 -c 1 ${domain} | sed '1{s/[^(]*(//;s/).*//;q;}') pingIP=$(ping6 -c 1 ${domain} | sed '2{s/[^(]*(//;s/).*//;q;}' | sed -n '$p')
pingIPv6=${pingIP} pingIPv6=${pingIP}
fi fi
@ -2637,7 +2637,7 @@ checkLog() {
# 脚本快捷方式 # 脚本快捷方式
aliasInstall() { aliasInstall() {
if [[ -f "$HOME/install.sh" ]] && [[ -d "/etc/v2ray-agent" ]] && "$HOME/install.sh" | grep -q "作者：mack-a"; then if [[ -f "$HOME/install.sh" ]] && [[ -d "/etc/v2ray-agent" ]] && grep <$HOME/install.sh -q "作者：mack-a"; then
mv "$HOME/install.sh" /etc/v2ray-agent/install.sh mv "$HOME/install.sh" /etc/v2ray-agent/install.sh
if [[ -d "/usr/bin/" ]] && [[ ! -f "/usr/bin/vasma" ]]; then if [[ -d "/usr/bin/" ]] && [[ ! -f "/usr/bin/vasma" ]]; then
ln -s /etc/v2ray-agent/install.sh /usr/bin/vasma ln -s /etc/v2ray-agent/install.sh /usr/bin/vasma
@ -3086,7 +3086,7 @@ menu() {
cd "$HOME" || exit cd "$HOME" || exit
echoContent red "\n==============================================================" echoContent red "\n=============================================================="
echoContent green "作者：mack-a" echoContent green "作者：mack-a"
echoContent green "当前版本：v2.3.7" echoContent green "当前版本：v2.3.8"
echoContent green "Github：https://github.com/mack-a/v2ray-agent" echoContent green "Github：https://github.com/mack-a/v2ray-agent"
echoContent green "描述：七合一共存脚本" echoContent green "描述：七合一共存脚本"
echoContent red "==============================================================" echoContent red "=============================================================="