Update sb.sh
This commit is contained in:
@@ -1114,7 +1114,7 @@ echo "二维码【v2rayn、v2rayng、nekobox、小火箭shadowrocket】"
|
||||
echo 'vmess://'$(echo '{"add":"'$vmadd_argo'","aid":"0","host":"'$argo'","id":"'$uuid'","net":"ws","path":"'$ws_path'","port":"8443","ps":"'vm-argo-$hostname'","tls":"tls","sni":"'$argo'","fp":"chrome","type":"none","v":"2"}' | base64 -w 0) > /etc/s-box/vm_ws_argols.txt
|
||||
qrencode -o - -t ANSIUTF8 "$(cat /etc/s-box/vm_ws_argols.txt)"
|
||||
fi
|
||||
if ps -ef | grep -q '[c]loudflared.*run'; then
|
||||
if ps -ef 2>/dev/null | grep -q '[c]loudflared.*run'; then
|
||||
argogd=$(cat /etc/s-box/sbargoym.log 2>/dev/null)
|
||||
echo
|
||||
white "~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~"
|
||||
@@ -1597,7 +1597,7 @@ EOF
|
||||
|
||||
tls=$(sed 's://.*::g' /etc/s-box/sb.json | jq -r '.inbounds[1].tls.enabled')
|
||||
argopid
|
||||
if ps -ef | grep -q '[c]loudflared.*run' && ps -p "$ls" >/dev/null 2>&1 && [ "$tls" = "false" ]; then
|
||||
if ps -ef 2>/dev/null | grep -q '[c]loudflared.*run' && ps -p "$ls" >/dev/null 2>&1 && [ "$tls" = "false" ]; then
|
||||
cat > /etc/s-box/sbox.json <<EOF
|
||||
$(sball)
|
||||
$(sbany2)
|
||||
@@ -1876,7 +1876,7 @@ rules:
|
||||
- MATCH,🌍选择代理节点
|
||||
EOF
|
||||
|
||||
elif ! ps -ef | grep -q '[c]loudflared.*run' && ps -p "$ls" >/dev/null 2>&1 && [ "$tls" = "false" ]; then
|
||||
elif ! ps -ef 2>/dev/null | grep -q '[c]loudflared.*run' && ps -p "$ls" >/dev/null 2>&1 && [ "$tls" = "false" ]; then
|
||||
cat > /etc/s-box/sbox.json <<EOF
|
||||
$(sball)
|
||||
$(sbany2)
|
||||
@@ -2065,7 +2065,7 @@ rules:
|
||||
- MATCH,🌍选择代理节点
|
||||
EOF
|
||||
|
||||
elif ps -ef | grep -q '[c]loudflared.*run' && ! ps -p "$ls" >/dev/null 2>&1 && [ "$tls" = "false" ]; then
|
||||
elif ps -ef 2>/dev/null | grep -q '[c]loudflared.*run' && ! ps -p "$ls" >/dev/null 2>&1 && [ "$tls" = "false" ]; then
|
||||
cat > /etc/s-box/sbox.json <<EOF
|
||||
$(sball)
|
||||
$(sbany2)
|
||||
@@ -2388,7 +2388,7 @@ if [ "$menu" = "1" ]; then
|
||||
cloudflaredargo
|
||||
readp "输入Argo固定隧道Token: " argotoken
|
||||
readp "输入Argo固定隧道域名: " argoym
|
||||
pid=$(ps -ef | awk '/[c]loudflared.*run/ {print $2}')
|
||||
pid=$(ps -ef 2>/dev/null | awk '/[c]loudflared.*run/ {print $2}')
|
||||
[ -n "$pid" ] && kill -9 "$pid" >/dev/null 2>&1
|
||||
echo
|
||||
if [[ -n "${argotoken}" && -n "${argoym}" ]]; then
|
||||
@@ -3993,7 +3993,7 @@ sbymfl
|
||||
tls=$(sed 's://.*::g' /etc/s-box/sb.json | jq -r '.inbounds[1].tls.enabled')
|
||||
if [[ "$tls" = "false" ]]; then
|
||||
argopid
|
||||
if ps -ef | grep -q '[c]loudflared.*run' || ps -p "$ls" >/dev/null 2>&1; then
|
||||
if ps -ef 2>/dev/null | grep -q '[c]loudflared.*run' || ps -p "$ls" >/dev/null 2>&1; then
|
||||
vm_zs="TLS关闭"
|
||||
argoym="已开启"
|
||||
else
|
||||
@@ -4037,7 +4037,7 @@ if [ "$argoym" = "已开启" ]; then
|
||||
if ps -p "$ls" >/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}"
|
||||
fi
|
||||
if ps -ef | grep -q '[c]loudflared.*run'; then
|
||||
if ps -ef 2>/dev/null | grep -q '[c]loudflared.*run'; then
|
||||
echo -e "Argo固定域名:${yellow}$(cat /etc/s-box/sbargoym.log 2>/dev/null)${plain}"
|
||||
fi
|
||||
fi
|
||||
|
||||
Reference in New Issue
Block a user