Update shadowsocks-debian

shadowsocks-debian

@@ -11,94 +11,66 @@
 
 # Author: Teddysun <i@teddysun.com>
 
-NAME=shadowsocks
+name=shadowsocks
-BIN=/usr/bin/ssserver
+BIN=/usr/local/bin/ssserver
-CONFIG_FILE=/etc/shadowsocks.json
+conf=/etc/shadowsocks.json
-PID_DIR=/var/run
+#pid=/var/run/shadowsocks.pid
-PID_FILE=$PID_DIR/shadowsocks.pid
-RET_VAL=0
 
-[ -x $BIN ] || exit 0
+start(){
-
+    /usr/bin/ssserver -c $conf -d start
-check_running() {
+    RETVAL=$?
-  if [[ -r $PID_FILE ]]; then
+    if [ "$RETVAL" = "0" ]; then
-    read PID <$PID_FILE
+        echo "$name start success"
-    if [[ -d "/proc/$PID" ]]; then
-      return 0
     else
-      rm -f $PID_FILE
+        echo "$name start failed"
-      return 1
+    fi
+}
+
+stop(){
+    pid=`ps -ef | grep -v grep | grep -v ps | grep -i '/usr/bin/python /usr/bin/ssserver' | awk '{print $2}'`
+    if [ ! -z $pid ]; then
+        /usr/bin/ssserver -c $conf -d stop
+        RETVAL=$?
+        if [ "$RETVAL" = "0" ]; then
+            echo "$name stop success"
+        else
+            echo "$name stop failed"
         fi
     else
-    return 2
+        echo "$name is not running"
+        RETVAL=1
     fi
 }
 
-do_status() {
+status(){
-  check_running
+    pid=`ps -ef | grep -v grep | grep -v ps | grep -i '/usr/bin/python /usr/bin/ssserver' | awk '{print $2}'`
-  case $? in
+    if [ -z $pid ]; then
-    0)
+        echo "$name is not running"
-      echo "$NAME running with PID $PID"
+        RETVAL=1
-      ;;
-    1)
-      echo "$NAME not running, remove PID file $PID_FILE"
-      ;;
-    2)
-      echo "Could not find PID file $PID_FILE, $NAME does not appear to be running"
-      ;;
-  esac
-  return 0
-}
-
-do_start() {
-  if [[ ! -d $PID_DIR ]]; then
-    mkdir $PID_DIR || echo "failed creating PID directory $PID_DIR"; exit 1
-  fi
-  if check_running; then
-    echo "$NAME already running with PID $PID"
-    return 0
-  fi
-  if [[ ! -r $CONFIG_FILE ]]; then
-    echo "config file $CONFIG_FILE not found"
-    return 1
-  fi
-  echo "starting $NAME"
-  # sudo will set the group to the primary group of $USER
-  $BIN -c $CONFIG_FILE -d start
-  PID=$!
-  echo $PID > $PID_FILE
-  sleep 0.3
-  if ! check_running; then
-    echo "start failed"
-    return 1
-  fi
-  echo "$NAME running with PID $PID"
-  return 0
-}
-
-do_stop() {
-  if check_running; then
-    echo "stopping $NAME with PID $PID"
-    kill $PID
-    rm -f $PID_FILE
     else
-    echo "Could not find PID file $PID_FILE"
+        echo "$name is running with PID $pid"
+        RETVAL=0
     fi
 }
 
-do_restart() {
-  do_stop
-  do_start
-}
-
 case "$1" in
-  start|stop|restart|status)
+'start')
-    do_$1
+    start
+    ;;
+'stop')
+    stop
+    ;;
+'status')
+    status
+    ;;
+'restart')
+    stop
+    start
+    RETVAL=$?
     ;;
 *)
-    echo "Usage: shadowsocks {start|stop|restart|status}"
+    echo "Usage: $0 { start | stop | restart | status }"
-    RET_VAL=1
+    RETVAL=1
     ;;
 esac
-
+exit $RETVAL
-exit $RET_VAL