浏览代码

Update SoftEther.sh

MoeClub 5 年之前
父节点
当前提交
0b2839edd7
共有 1 个文件被更改,包括 3 次插入2 次删除
  1. 3 2
      SoftEther/SoftEther.sh

+ 3 - 2
SoftEther/SoftEther.sh

@@ -34,6 +34,7 @@ while [[ $# -ge 1 ]]; do
 [ -n "$PASSWD" ] || PASSWD="vpn"
 
 
+kill -9 `ps -C "vpnserver" -o pid=` >/dev/null 2>&1
 rm -rf /tmp/vpnserver
 rm -rf /etc/softether
 mkdir -p /etc/softether
@@ -62,8 +63,8 @@ if [ -f /etc/crontab ]; then
 fi
 
 /etc/softether/vpnserver start
-echo "Waiting service ..."
-sleep 5
+
+while true; do /etc/softether/vpncmd 127.0.0.1:5555 /SERVER /PASSWORD:empty /CMD:About >/dev/null 2>&1; [ $? -eq 0 ] && break; echo "Waiting vpnserver ..."; sleep 1; done
 
 /etc/softether/vpncmd 127.0.0.1:5555 /SERVER /PASSWORD:empty /HUB:DEFAULT /CMD:UserCreate "$USER" /GROUP: /REALNAME: /NOTE:
 /etc/softether/vpncmd 127.0.0.1:5555 /SERVER /PASSWORD:empty /HUB:DEFAULT /CMD:UserPasswordSet "$USER" /PASSWORD:"$PASSWD"