Update sb.sh
This commit is contained in:
@@ -173,10 +173,6 @@ systemctl start warp-go >/dev/null 2>&1
|
||||
fi
|
||||
}
|
||||
|
||||
argopid(){
|
||||
ls=$(cat /etc/s-box/sbargopid.log 2>/dev/null)
|
||||
}
|
||||
|
||||
close(){
|
||||
systemctl stop firewalld.service >/dev/null 2>&1
|
||||
systemctl disable firewalld.service >/dev/null 2>&1
|
||||
@@ -2460,11 +2456,8 @@ readp "请选择【0-2】:" menu
|
||||
if [ "$menu" = "1" ]; then
|
||||
green "请稍等……"
|
||||
cloudflaredargo
|
||||
if [[ -n $(ps -e | grep cloudflared) ]]; then
|
||||
kill -15 $(cat /etc/s-box/sbargopid.log 2>/dev/null) >/dev/null 2>&1
|
||||
fi
|
||||
ps -ef | grep '[c]loudflared.*url' | awk '{print $2}' | xargs kill 2>/dev/null
|
||||
nohup /etc/s-box/cloudflared tunnel --url http://localhost:$(sed 's://.*::g' /etc/s-box/sb.json | jq -r '.inbounds[1].listen_port') --edge-ip-version auto --no-autoupdate --protocol http2 > /etc/s-box/argo.log 2>&1 &
|
||||
echo "$!" > /etc/s-box/sbargopid.log
|
||||
sleep 20
|
||||
if [[ -n $(curl -sL https://$(cat /etc/s-box/argo.log 2>/dev/null | grep -a trycloudflare.com | awk 'NR==2{print}' | awk -F// '{print $2}' | awk '{print $1}')/ -I | awk 'NR==1 && /404|400|503/') ]]; then
|
||||
argo=$(cat /etc/s-box/argo.log 2>/dev/null | grep -a trycloudflare.com | awk 'NR==2{print}' | awk -F// '{print $2}' | awk '{print $1}')
|
||||
@@ -2482,8 +2475,7 @@ chmod +x /etc/local.d/alpineargo.start
|
||||
rc-update add local default >/dev/null 2>&1
|
||||
else
|
||||
crontab -l 2>/dev/null > /tmp/crontab.tmp
|
||||
sed -i '/sbargopid/d' /tmp/crontab.tmp
|
||||
echo '@reboot sleep 10 && /bin/bash -c "nohup /etc/s-box/cloudflared tunnel --url http://localhost:$(sed 's://.*::g' /etc/s-box/sb.json | jq -r '.inbounds[1].listen_port') --edge-ip-version auto --no-autoupdate --protocol http2 > /etc/s-box/argo.log 2>&1 & pid=\$! && echo \$pid > /etc/s-box/sbargopid.log && sleep 5 && printf \"9\n1\n\" | bash /usr/bin/sb > /dev/null 2>&1"' >> /tmp/crontab.tmp
|
||||
echo '@reboot sleep 10 && /bin/bash -c "nohup /etc/s-box/cloudflared tunnel --url http://localhost:$(sed 's://.*::g' /etc/s-box/sb.json | jq -r '.inbounds[1].listen_port') --edge-ip-version auto --no-autoupdate --protocol http2 > /etc/s-box/argo.log 2>&1 & sleep 10 && printf \"9\n1\n\" | bash /usr/bin/sb > /dev/null 2>&1"' >> /tmp/crontab.tmp
|
||||
crontab /tmp/crontab.tmp >/dev/null 2>&1
|
||||
rm /tmp/crontab.tmp
|
||||
fi
|
||||
@@ -2491,11 +2483,7 @@ else
|
||||
yellow "Argo临时域名验证暂不可用,请稍后再试"
|
||||
fi
|
||||
elif [ "$menu" = "2" ]; then
|
||||
kill -15 $(cat /etc/s-box/sbargopid.log 2>/dev/null) >/dev/null 2>&1
|
||||
crontab -l 2>/dev/null > /tmp/crontab.tmp
|
||||
sed -i '/sbargopid/d' /tmp/crontab.tmp
|
||||
crontab /tmp/crontab.tmp >/dev/null 2>&1
|
||||
rm /tmp/crontab.tmp
|
||||
ps -ef | grep '[c]loudflared.*url' | awk '{print $2}' | xargs kill 2>/dev/null
|
||||
rm -rf /etc/s-box/vm_ws_argols.txt
|
||||
rm -rf /etc/local.d/alpineargo.start
|
||||
sbshare > /dev/null 2>&1
|
||||
@@ -3803,7 +3791,6 @@ rm /tmp/crontab.tmp
|
||||
uncronsb(){
|
||||
crontab -l 2>/dev/null > /tmp/crontab.tmp
|
||||
sed -i '/sing-box/d' /tmp/crontab.tmp
|
||||
sed -i '/sbargopid/d' /tmp/crontab.tmp
|
||||
sed -i '/sbwpphid.log/d' /tmp/crontab.tmp
|
||||
sed -i '/subcmsbid/d' /tmp/crontab.tmp
|
||||
crontab /tmp/crontab.tmp >/dev/null 2>&1
|
||||
@@ -3895,7 +3882,7 @@ systemctl disable "$svc" >/dev/null 2>&1
|
||||
done
|
||||
rm -rf /etc/systemd/system/{sing-box.service,argo.service}
|
||||
fi
|
||||
kill -15 $(cat /etc/s-box/sbargopid.log 2>/dev/null) >/dev/null 2>&1
|
||||
ps -ef | grep '[c]loudflared.*url' | awk '{print $2}' | xargs kill 2>/dev/null
|
||||
kill -15 $(cat /etc/s-box/sbwpphid.log 2>/dev/null) >/dev/null 2>&1
|
||||
kill -15 $(cat /etc/s-box/subcmsbid.log 2>/dev/null) >/dev/null 2>&1
|
||||
rm -rf /etc/s-box sbyg_update /usr/bin/sb /root/geoip.db /root/geosite.db /root/warpapi /root/warpip /root/web
|
||||
@@ -4014,7 +4001,6 @@ allports
|
||||
sbymfl
|
||||
tls=$(sed 's://.*::g' /etc/s-box/sb.json | jq -r '.inbounds[1].tls.enabled')
|
||||
if [[ "$tls" = "false" ]]; then
|
||||
argopid
|
||||
if ps -ef 2>/dev/null | grep -q '[c]loudflared.*run' || ps -ef 2>/dev/null | grep -q '[c]loudflared.*url'; then
|
||||
vm_zs="TLS关闭"
|
||||
argoym="已开启"
|
||||
|
||||
Reference in New Issue
Block a user