From 727b60d2921a541b174a2cd8f9f39a1350404dce Mon Sep 17 00:00:00 2001 From: Teddysun Date: Fri, 29 Dec 2017 08:52:15 +0900 Subject: [PATCH] Fixed issues #50 Signed-off-by: Teddysun --- shadowsocks-crond.sh | 15 ++------------- 1 file changed, 2 insertions(+), 13 deletions(-) diff --git a/shadowsocks-crond.sh b/shadowsocks-crond.sh index 30dfda1..5db9125 100644 --- a/shadowsocks-crond.sh +++ b/shadowsocks-crond.sh @@ -11,12 +11,6 @@ path=/var/log [[ ! -d ${path} ]] && mkdir -p ${path} log=${path}/shadowsocks-crond.log -shadowsocks[0]=/usr/bin/ssserver -shadowsocks[1]=/usr/local/bin/ssserver -shadowsocks[2]=/usr/bin/shadowsocks-server -shadowsocks[3]=/usr/local/bin/ss-server -shadowsocks[4]=/usr/local/shadowsocks/server.py - shadowsocks_init[0]=/etc/init.d/shadowsocks shadowsocks_init[1]=/etc/init.d/shadowsocks-python shadowsocks_init[2]=/etc/init.d/shadowsocks-r @@ -27,14 +21,9 @@ i=0 for init in ${shadowsocks_init[@]}; do pid="" if [ -f ${init} ]; then - ${init} status > /dev/null 2>&1 + ss_status=`${init} status` if [ $? -eq 0 ]; then - for bin in ${shadowsocks[@]}; do - pid=`ps -ef | grep -v grep | grep -i "${bin}" | awk '{print $2}'` - if [ ! -z ${pid} ]; then - break - fi - done + pid=`echo $ss_status | sed 's/[^0-9]*//g'` fi if [ -z ${pid} ]; then