From 5d0c35a6269591fb818eff1bcfe7fa2f4837b317 Mon Sep 17 00:00:00 2001
From: Teddysun <i@teddysun.com>
Date: Thu, 28 Jan 2016 22:07:54 +0900
Subject: [PATCH] Update script

---
 shadowsocks        | 8 ++++----
 shadowsocks-debian | 9 ++++-----
 2 files changed, 8 insertions(+), 9 deletions(-)

diff --git a/shadowsocks b/shadowsocks
index 0ef6a2e..372caec 100644
--- a/shadowsocks
+++ b/shadowsocks
@@ -28,8 +28,8 @@ start(){
 }
 
 stop(){
-    pid=`ps -ef | grep -v grep | grep -v ps | grep -i "${BIN}" | awk '{print $2}'`
-    if [ ! -z $pid ]; then
+    pid=`ps -ef | grep -v grep | grep -i "${BIN}" | awk '{print $2}'`
+    if [[ ! -z $pid ]]; then
         $BIN -c $conf -d stop
         RETVAL=$?
         if [ "$RETVAL" = "0" ]; then
@@ -44,8 +44,8 @@ stop(){
 }
 
 status(){
-    pid=`ps -ef | grep -v grep | grep -v ps | grep -i "${BIN}" | awk '{print $2}'`
-    if [ -z $pid ]; then
+    pid=`ps -ef | grep -v grep | grep -i "${BIN}" | awk '{print $2}'`
+    if [[ -z $pid ]]; then
         echo "$name is not running"
         RETVAL=1
     else
diff --git a/shadowsocks-debian b/shadowsocks-debian
index 466a5a4..faf86a9 100644
--- a/shadowsocks-debian
+++ b/shadowsocks-debian
@@ -14,7 +14,6 @@
 name=shadowsocks
 BIN=/usr/local/bin/ssserver
 conf=/etc/shadowsocks.json
-#pid=/var/run/shadowsocks.pid
 
 start(){
     $BIN -c $conf -d start
@@ -27,8 +26,8 @@ start(){
 }
 
 stop(){
-    pid=`ps -ef | grep -v grep | grep -v ps | grep -i "/usr/bin/python ${BIN}" | awk '{print $2}'`
-    if [ ! -z $pid ]; then
+    pid=`ps -ef | grep -v grep | grep -i "${BIN}" | awk '{print $2}'`
+    if [[ ! -z $pid ]]; then
         $BIN -c $conf -d stop
         RETVAL=$?
         if [ "$RETVAL" = "0" ]; then
@@ -43,8 +42,8 @@ stop(){
 }
 
 status(){
-    pid=`ps -ef | grep -v grep | grep -v ps | grep -i "/usr/bin/python ${BIN}" | awk '{print $2}'`
-    if [ -z $pid ]; then
+    pid=`ps -ef | grep -v grep | grep -i "${BIN}" | awk '{print $2}'`
+    if [[ -z $pid ]]; then
         echo "$name is not running"
         RETVAL=1
     else