Update sb.sh
This commit is contained in:
@@ -1098,7 +1098,7 @@ echo
|
|||||||
|
|
||||||
resvmess(){
|
resvmess(){
|
||||||
if [[ "$tls" = "false" ]]; then
|
if [[ "$tls" = "false" ]]; then
|
||||||
if ps -ef 2>/dev/null | grep "localhost:$(sed 's://.*::g' /etc/s-box/sb.json | jq -r '.inbounds[1].listen_port')"; then
|
if ps -ef 2>/dev/null | grep "localhost:$(sed 's://.*::g' /etc/s-box/sb.json | jq -r '.inbounds[1].listen_port')" >/dev/null 2>&1; then
|
||||||
echo
|
echo
|
||||||
white "~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~"
|
white "~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~"
|
||||||
red "🚀【 vmess-ws(tls)+Argo 】临时节点信息如下(可选择3-8-3,自定义CDN优选地址):" && sleep 2
|
red "🚀【 vmess-ws(tls)+Argo 】临时节点信息如下(可选择3-8-3,自定义CDN优选地址):" && sleep 2
|
||||||
@@ -1592,7 +1592,7 @@ EOF
|
|||||||
}
|
}
|
||||||
|
|
||||||
tls=$(sed 's://.*::g' /etc/s-box/sb.json | jq -r '.inbounds[1].tls.enabled')
|
tls=$(sed 's://.*::g' /etc/s-box/sb.json | jq -r '.inbounds[1].tls.enabled')
|
||||||
if ps -ef 2>/dev/null | grep -q '[c]loudflared.*run' && ps -ef 2>/dev/null | grep "localhost:$(sed 's://.*::g' /etc/s-box/sb.json | jq -r '.inbounds[1].listen_port')" && [ "$tls" = "false" ]; then
|
if ps -ef 2>/dev/null | grep -q '[c]loudflared.*run' && ps -ef 2>/dev/null | grep "localhost:$(sed 's://.*::g' /etc/s-box/sb.json | jq -r '.inbounds[1].listen_port')" >/dev/null 2>&1 && [ "$tls" = "false" ]; then
|
||||||
cat > /etc/s-box/sbox.json <<EOF
|
cat > /etc/s-box/sbox.json <<EOF
|
||||||
$(sball)
|
$(sball)
|
||||||
$(sbany2)
|
$(sbany2)
|
||||||
@@ -1871,7 +1871,7 @@ rules:
|
|||||||
- MATCH,🌍选择代理节点
|
- MATCH,🌍选择代理节点
|
||||||
EOF
|
EOF
|
||||||
|
|
||||||
elif ! ps -ef 2>/dev/null | grep -q '[c]loudflared.*run' && ps -ef 2>/dev/null | grep "localhost:$(sed 's://.*::g' /etc/s-box/sb.json | jq -r '.inbounds[1].listen_port')" && [ "$tls" = "false" ]; then
|
elif ! ps -ef 2>/dev/null | grep -q '[c]loudflared.*run' && ps -ef 2>/dev/null | grep "localhost:$(sed 's://.*::g' /etc/s-box/sb.json | jq -r '.inbounds[1].listen_port')" >/dev/null 2>&1 && [ "$tls" = "false" ]; then
|
||||||
cat > /etc/s-box/sbox.json <<EOF
|
cat > /etc/s-box/sbox.json <<EOF
|
||||||
$(sball)
|
$(sball)
|
||||||
$(sbany2)
|
$(sbany2)
|
||||||
@@ -2060,7 +2060,7 @@ rules:
|
|||||||
- MATCH,🌍选择代理节点
|
- MATCH,🌍选择代理节点
|
||||||
EOF
|
EOF
|
||||||
|
|
||||||
elif ps -ef 2>/dev/null | grep -q '[c]loudflared.*run' && ! ps -ef 2>/dev/null | grep "localhost:$(sed 's://.*::g' /etc/s-box/sb.json | jq -r '.inbounds[1].listen_port')" && [ "$tls" = "false" ]; then
|
elif ps -ef 2>/dev/null | grep -q '[c]loudflared.*run' && ! ps -ef 2>/dev/null | grep "localhost:$(sed 's://.*::g' /etc/s-box/sb.json | jq -r '.inbounds[1].listen_port')" >/dev/null 2>&1 && [ "$tls" = "false" ]; then
|
||||||
cat > /etc/s-box/sbox.json <<EOF
|
cat > /etc/s-box/sbox.json <<EOF
|
||||||
$(sball)
|
$(sball)
|
||||||
$(sbany2)
|
$(sbany2)
|
||||||
@@ -4004,7 +4004,7 @@ allports
|
|||||||
sbymfl
|
sbymfl
|
||||||
tls=$(sed 's://.*::g' /etc/s-box/sb.json | jq -r '.inbounds[1].tls.enabled')
|
tls=$(sed 's://.*::g' /etc/s-box/sb.json | jq -r '.inbounds[1].tls.enabled')
|
||||||
if [[ "$tls" = "false" ]]; then
|
if [[ "$tls" = "false" ]]; then
|
||||||
if ps -ef 2>/dev/null | grep -q '[c]loudflared.*run' || ps -ef 2>/dev/null | grep "localhost:$(sed 's://.*::g' /etc/s-box/sb.json | jq -r '.inbounds[1].listen_port')"; then
|
if ps -ef 2>/dev/null | grep -q '[c]loudflared.*run' || ps -ef 2>/dev/null | grep "localhost:$(sed 's://.*::g' /etc/s-box/sb.json | jq -r '.inbounds[1].listen_port')" >/dev/null 2>&1; then
|
||||||
vm_zs="TLS关闭"
|
vm_zs="TLS关闭"
|
||||||
argoym="已开启"
|
argoym="已开启"
|
||||||
else
|
else
|
||||||
@@ -4047,7 +4047,7 @@ fi
|
|||||||
if [ "$argoym" = "已开启" ]; then
|
if [ "$argoym" = "已开启" ]; then
|
||||||
#echo -e "Vmess-UUID:${yellow}$(sed 's://.*::g' /etc/s-box/sb.json | jq -r '.inbounds[0].users[0].uuid')${plain}"
|
#echo -e "Vmess-UUID:${yellow}$(sed 's://.*::g' /etc/s-box/sb.json | jq -r '.inbounds[0].users[0].uuid')${plain}"
|
||||||
#echo -e "Vmess-Path:${yellow}$(sed 's://.*::g' /etc/s-box/sb.json | jq -r '.inbounds[1].transport.path')${plain}"
|
#echo -e "Vmess-Path:${yellow}$(sed 's://.*::g' /etc/s-box/sb.json | jq -r '.inbounds[1].transport.path')${plain}"
|
||||||
if ps -ef 2>/dev/null | grep "localhost:$(sed 's://.*::g' /etc/s-box/sb.json | jq -r '.inbounds[1].listen_port')"; then
|
if ps -ef 2>/dev/null | grep "localhost:$(sed 's://.*::g' /etc/s-box/sb.json | jq -r '.inbounds[1].listen_port')" >/dev/null 2>&1; then
|
||||||
echo -e "Argo临时域名:${yellow}$(cat /etc/s-box/argo.log 2>/dev/null | grep -a trycloudflare.com | awk 'NR==2{print}' | awk -F// '{print $2}' | awk '{print $1}')${plain}"
|
echo -e "Argo临时域名:${yellow}$(cat /etc/s-box/argo.log 2>/dev/null | grep -a trycloudflare.com | awk 'NR==2{print}' | awk -F// '{print $2}' | awk '{print $1}')${plain}"
|
||||||
fi
|
fi
|
||||||
if ps -ef 2>/dev/null | grep -q '[c]loudflared.*run'; then
|
if ps -ef 2>/dev/null | grep -q '[c]loudflared.*run'; then
|
||||||
|
|||||||
Reference in New Issue
Block a user