diff --git a/sb.sh b/sb.sh index f6ec61a..e334a09 100644 --- a/sb.sh +++ b/sb.sh @@ -3109,12 +3109,12 @@ subtokenipsub elif [ "$menu" = "3" ];then subportipsub elif [ "$menu" = "4" ];then -kill -15 $(cat /etc/s-box/subcmsbid.log 2>/dev/null) >/dev/null 2>&1 +ps -ef | grep "$(cat /etc/s-box/subport.log 2>/dev/null)" | grep -v grep | awk 'NR==1 {print $2}' | xargs kill 2>/dev/null crontab -l 2>/dev/null > /tmp/crontab.tmp -sed -i '/subcmsbid/d' /tmp/crontab.tmp +sed -i '/httpd -f -p/d' /tmp/crontab.tmp crontab /tmp/crontab.tmp >/dev/null 2>&1 rm /tmp/crontab.tmp -rm -rf /root/web /etc/s-box/subcmsbid.log +rm -rf /root/web rm -rf /etc/local.d/alpinesub.start green "本地IP订阅链接已卸载完成" && sleep 3 && exit else @@ -3122,7 +3122,7 @@ changeserv fi echo green "请稍后…………" -kill -15 $(cat /etc/s-box/subcmsbid.log 2>/dev/null) >/dev/null 2>&1 +ps -ef | grep "$(cat /etc/s-box/subport.log 2>/dev/null)" | grep -v grep | awk 'NR==1 {print $2}' | xargs kill 2>/dev/null mkdir -p /root/web/"$(cat /etc/s-box/subtoken.log 2>/dev/null)" ln -sf /etc/s-box/clmi.yaml /root/web/"$(cat /etc/s-box/subtoken.log 2>/dev/null)"/clmi.yaml ln -sf /etc/s-box/sbox.json /root/web/"$(cat /etc/s-box/subtoken.log 2>/dev/null)"/sbox.json @@ -3132,7 +3132,6 @@ busybox-extras httpd -f -p "$(cat /etc/s-box/subport.log 2>/dev/null)" -h /root/ else busybox httpd -f -p "$(cat /etc/s-box/subport.log 2>/dev/null)" -h /root/web > /dev/null 2>&1 & fi -echo "$!" > /etc/s-box/subcmsbid.log sleep 5 if command -v apk >/dev/null 2>&1; then cat > /etc/local.d/alpinesub.start <<'EOF' @@ -3144,8 +3143,8 @@ chmod +x /etc/local.d/alpinesub.start rc-update add local default >/dev/null 2>&1 else crontab -l 2>/dev/null > /tmp/crontab.tmp -sed -i '/subcmsbid/d' /tmp/crontab.tmp -echo '@reboot sleep 10 && /bin/bash -c "busybox httpd -f -p $(cat /etc/s-box/subport.log 2>/dev/null) -h /root/web > /dev/null 2>&1 & pid=\$! && echo \$pid > /etc/s-box/subcmsbid.log"' >> /tmp/crontab.tmp +sed -i '/httpd -f -p/d' /tmp/crontab.tmp +echo '@reboot sleep 10 && /bin/bash -c "busybox httpd -f -p $(cat /etc/s-box/subport.log 2>/dev/null) -h /root/web > /dev/null 2>&1 &"' >> /tmp/crontab.tmp crontab /tmp/crontab.tmp >/dev/null 2>&1 rm /tmp/crontab.tmp fi @@ -3792,7 +3791,7 @@ uncronsb(){ crontab -l 2>/dev/null > /tmp/crontab.tmp sed -i '/sing-box/d' /tmp/crontab.tmp sed -i '/sbwpphid.log/d' /tmp/crontab.tmp -sed -i '/subcmsbid/d' /tmp/crontab.tmp +sed -i '/httpd -f -p/d' /tmp/crontab.tmp crontab /tmp/crontab.tmp >/dev/null 2>&1 rm /tmp/crontab.tmp } @@ -3884,7 +3883,7 @@ rm -rf /etc/systemd/system/{sing-box.service,argo.service} fi 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 +ps -ef | grep "$(cat /etc/s-box/subport.log 2>/dev/null)" | grep -v grep | awk 'NR==1 {print $2}' | xargs kill 2>/dev/null rm -rf /etc/s-box sbyg_update /usr/bin/sb /root/geoip.db /root/geosite.db /root/warpapi /root/warpip /root/web rm -f /etc/local.d/alpineargo.start /etc/local.d/alpinesub.start /etc/local.d/alpinews5.start uncronsb @@ -4030,7 +4029,7 @@ echo -e "🚀【 Tuic-v5 】${yellow}端口:$tu5_port 证书形式:$tu5_z if [[ "$sbnh" != "1.10" ]]; then echo -e "🚀【 Anytls 】${yellow}端口:$an_port 证书形式:$an_zs${plain}" fi -if [ -n "$(cat /etc/s-box/subcmsbid.log 2>/dev/null)" ]; then +if [ -n "$(ps -ef 2>/dev/null | grep "$(cat /etc/s-box/subport.log 2>/dev/null)" | grep -v grep | awk 'NR==1 {print $2}')" ]; then showsubtoken=$(cat /etc/s-box/subtoken.log 2>/dev/null) showsubport=$(cat /etc/s-box/subport.log 2>/dev/null) subip=$(cat /etc/s-box/server_ip.log)