From 845357f546a80e7064bdedeba1811f6eaf939ed8 Mon Sep 17 00:00:00 2001
From: Teddysun <i@teddysun.com>
Date: Sat, 17 Sep 2016 12:37:11 +0900
Subject: [PATCH] update comment

---
 shadowsocks           | 28 +++++++++++++---------------
 shadowsocks-debian    | 28 +++++++++++++---------------
 shadowsocks-go        | 22 +++++++++++-----------
 shadowsocks-go-debian | 22 +++++++++++-----------
 shadowsocksR          | 26 ++++++++++++--------------
 shadowsocksR-debian   | 26 ++++++++++++--------------
 6 files changed, 72 insertions(+), 80 deletions(-)

diff --git a/shadowsocks b/shadowsocks
index 6b79e32..8999961 100644
--- a/shadowsocks
+++ b/shadowsocks
@@ -19,8 +19,9 @@ if [ -f /usr/bin/ssserver ]; then
 elif [ -f /usr/local/bin/ssserver ]; then
     BIN=/usr/local/bin/ssserver
 fi
-NAME=shadowsocks
+NAME=Shadowsocks
 CONF=/etc/shadowsocks.json
+RETVAL=0
 
 check_running(){
     PID=`ps -ef | grep -v grep | grep -i "${BIN}" | awk '{print $2}'`
@@ -34,16 +35,15 @@ check_running(){
 do_start(){
     check_running
     if [ $? -eq 0 ]; then
-        echo "$NAME is already running with PID $PID"
-        RETVAL=1
+        echo "$NAME (pid $PID) is already running..."
+        exit 0
     else
         $BIN -c $CONF -d start
         RETVAL=$?
         if [ $RETVAL -eq 0 ]; then
-            echo "$NAME start success"
+            echo "Starting $NAME success"
         else
-            echo "$NAME start failed"
-            RETVAL=1
+            echo "Starting $NAME failed"
         fi
     fi
 }
@@ -54,13 +54,12 @@ do_stop(){
         $BIN -c $CONF -d stop
         RETVAL=$?
         if [ $RETVAL -eq 0 ]; then
-            echo "$NAME stop success"
+            echo "Stopping $NAME success"
         else
-            echo "$NAME stop failed"
-            RETVAL=1
+            echo "Stopping $NAME failed"
         fi
     else
-        echo "$NAME is not running"
+        echo "$NAME is stopped"
         RETVAL=1
     fi
 }
@@ -68,17 +67,16 @@ do_stop(){
 do_status(){
     check_running
     if [ $? -eq 0 ]; then
-        echo "$NAME is running with PID $PID"
-        RETVAL=0
+        echo "$NAME (pid $PID) is running..."
     else
-        echo "$NAME is not running"
+        echo "$NAME is stopped"
         RETVAL=1
     fi
 }
 
 do_restart(){
-  do_stop
-  do_start
+    do_stop
+    do_start
 }
 
 case "$1" in
diff --git a/shadowsocks-debian b/shadowsocks-debian
index ffa3e79..616e225 100644
--- a/shadowsocks-debian
+++ b/shadowsocks-debian
@@ -17,8 +17,9 @@ if [ -f /usr/bin/ssserver ]; then
 elif [ -f /usr/local/bin/ssserver ]; then
     BIN=/usr/local/bin/ssserver
 fi
-NAME=shadowsocks
+NAME=Shadowsocks
 CONF=/etc/shadowsocks.json
+RETVAL=0
 
 check_running(){
     PID=`ps -ef | grep -v grep | grep -i "${BIN}" | awk '{print $2}'`
@@ -32,16 +33,15 @@ check_running(){
 do_start(){
     check_running
     if [ $? -eq 0 ]; then
-        echo "$NAME is already running with PID $PID"
-        RETVAL=1
+        echo "$NAME (pid $PID) is already running..."
+        exit 0
     else
         $BIN -c $CONF -d start
         RETVAL=$?
         if [ $RETVAL -eq 0 ]; then
-            echo "$NAME start success"
+            echo "Starting $NAME success"
         else
-            echo "$NAME start failed"
-            RETVAL=1
+            echo "Starting $NAME failed"
         fi
     fi
 }
@@ -52,13 +52,12 @@ do_stop(){
         $BIN -c $CONF -d stop
         RETVAL=$?
         if [ $RETVAL -eq 0 ]; then
-            echo "$NAME stop success"
+            echo "Stopping $NAME success"
         else
-            echo "$NAME stop failed"
-            RETVAL=1
+            echo "Stopping $NAME failed"
         fi
     else
-        echo "$NAME is not running"
+        echo "$NAME is stopped"
         RETVAL=1
     fi
 }
@@ -66,17 +65,16 @@ do_stop(){
 do_status(){
     check_running
     if [ $? -eq 0 ]; then
-        echo "$NAME is running with PID $PID"
-        RETVAL=0
+        echo "$NAME (pid $PID) is running..."
     else
-        echo "$NAME is not running"
+        echo "$NAME is stopped"
         RETVAL=1
     fi
 }
 
 do_restart(){
-  do_stop
-  do_start
+    do_stop
+    do_start
 }
 
 case "$1" in
diff --git a/shadowsocks-go b/shadowsocks-go
index e872797..d5bd4de 100644
--- a/shadowsocks-go
+++ b/shadowsocks-go
@@ -29,11 +29,11 @@ RET_VAL=0
 
 [ -x $BIN ] || exit 0
 
-if [[ ! -d $PID_DIR ]]; then
+if [ ! -d $PID_DIR ]; then
     mkdir -p $PID_DIR
     if [ $? -ne 0 ]; then
         echo "Creating PID directory $PID_DIR failed"
-        RET_VAL=1
+        exit 1
     fi
 fi
 
@@ -43,9 +43,9 @@ if [ ! -f $CONF ]; then
 fi
 
 check_running() {
-    if [[ -r $PID_FILE ]]; then
+    if [ -r $PID_FILE ]; then
         read PID < $PID_FILE
-        if [[ -d "/proc/$PID" ]]; then
+        if [ -d "/proc/$PID" ]; then
             return 0
         else
             rm -f $PID_FILE
@@ -60,10 +60,10 @@ do_status() {
     check_running
     case $? in
         0)
-        echo "$NAME is running with PID $PID"
+        echo "$NAME (pid $PID) is running..."
         ;;
         1|2)
-        echo "$NAME is not running"
+        echo "$NAME is stopped"
         RET_VAL=1
         ;;
     esac
@@ -71,7 +71,7 @@ do_status() {
 
 do_start() {
     if check_running; then
-        echo "$NAME is already running with PID $PID"
+        echo "$NAME (pid $PID) is already running..."
         return 0
     fi
     $BIN -c $CONF 2>&1 > /dev/null &
@@ -79,9 +79,9 @@ do_start() {
     echo $PID > $PID_FILE
     sleep 0.3
     if check_running; then
-        echo "$NAME start success"
+        echo "Starting $NAME success"
     else
-        echo "$NAME start failed"
+        echo "Starting $NAME failed"
         RET_VAL=1
     fi
 }
@@ -90,9 +90,9 @@ do_stop() {
     if check_running; then
         kill -9 $PID
         rm -f $PID_FILE
-        echo "$NAME stop success"
+        echo "Stopping $NAME success"
     else
-        echo "$NAME is not running"
+        echo "$NAME is stopped"
         RET_VAL=1
     fi
 }
diff --git a/shadowsocks-go-debian b/shadowsocks-go-debian
index e8a316a..2d4e2bc 100644
--- a/shadowsocks-go-debian
+++ b/shadowsocks-go-debian
@@ -21,11 +21,11 @@ RET_VAL=0
 
 [ -x $BIN ] || exit 0
 
-if [[ ! -d $PID_DIR ]]; then
+if [ ! -d $PID_DIR ]; then
     mkdir -p $PID_DIR
     if [ $? -ne 0 ]; then
         echo "Creating PID directory $PID_DIR failed"
-        RET_VAL=1
+        exit 1
     fi
 fi
 
@@ -35,9 +35,9 @@ if [ ! -f $CONF ]; then
 fi
 
 check_running() {
-    if [[ -r $PID_FILE ]]; then
+    if [ -r $PID_FILE ]; then
         read PID < $PID_FILE
-        if [[ -d "/proc/$PID" ]]; then
+        if [ -d "/proc/$PID" ]; then
             return 0
         else
             rm -f $PID_FILE
@@ -52,10 +52,10 @@ do_status() {
     check_running
     case $? in
         0)
-        echo "$NAME is running with PID $PID"
+        echo "$NAME (pid $PID) is running..."
         ;;
         1|2)
-        echo "$NAME is not running"
+        echo "$NAME is stopped"
         RET_VAL=1
         ;;
     esac
@@ -63,7 +63,7 @@ do_status() {
 
 do_start() {
     if check_running; then
-        echo "$NAME is already running with PID $PID"
+        echo "$NAME (pid $PID) is already running..."
         return 0
     fi
     $BIN -c $CONF 2>&1 > /dev/null &
@@ -71,9 +71,9 @@ do_start() {
     echo $PID > $PID_FILE
     sleep 0.3
     if check_running; then
-        echo "$NAME start success"
+        echo "Starting $NAME success"
     else
-        echo "$NAME start failed"
+        echo "Starting $NAME failed"
         RET_VAL=1
     fi
 }
@@ -82,9 +82,9 @@ do_stop() {
     if check_running; then
         kill -9 $PID
         rm -f $PID_FILE
-        echo "$NAME stop success"
+        echo "Stopping $NAME success"
     else
-        echo "$NAME is not running"
+        echo "$NAME is stopped"
         RET_VAL=1
     fi
 }
diff --git a/shadowsocksR b/shadowsocksR
index 5a01b9c..76ff097 100644
--- a/shadowsocksR
+++ b/shadowsocksR
@@ -17,6 +17,7 @@
 NAME=ShadowsocksR
 BIN=/usr/local/shadowsocks/server.py
 CONF=/etc/shadowsocks.json
+RETVAL=0
 
 check_running(){
     PID=`ps -ef | grep -v grep | grep -i "${BIN}" | awk '{print $2}'`
@@ -30,16 +31,15 @@ check_running(){
 do_start(){
     check_running
     if [ $? -eq 0 ]; then
-        echo "$NAME is already running with PID $PID"
-        RETVAL=1
+        echo "$NAME (pid $PID) is already running..."
+        exit 0
     else
         $BIN -c $CONF -d start
         RETVAL=$?
         if [ $RETVAL -eq 0 ]; then
-            echo "$NAME start success"
+            echo "Starting $NAME success"
         else
-            echo "$NAME start failed"
-            RETVAL=1
+            echo "Starting $NAME failed"
         fi
     fi
 }
@@ -50,13 +50,12 @@ do_stop(){
         $BIN -c $CONF -d stop
         RETVAL=$?
         if [ $RETVAL -eq 0 ]; then
-            echo "$NAME stop success"
+            echo "Stopping $NAME success"
         else
-            echo "$NAME stop failed"
-            RETVAL=1
+            echo "Stopping $NAME failed"
         fi
     else
-        echo "$NAME is not running"
+        echo "$NAME is stopped"
         RETVAL=1
     fi
 }
@@ -64,17 +63,16 @@ do_stop(){
 do_status(){
     check_running
     if [ $? -eq 0 ]; then
-        echo "$NAME is running with PID $PID"
-        RETVAL=0
+        echo "$NAME (pid $PID) is running..."
     else
-        echo "$NAME is not running"
+        echo "$NAME is stopped"
         RETVAL=1
     fi
 }
 
 do_restart(){
-  do_stop
-  do_start
+    do_stop
+    do_start
 }
 
 case "$1" in
diff --git a/shadowsocksR-debian b/shadowsocksR-debian
index ccb54c8..539df7b 100644
--- a/shadowsocksR-debian
+++ b/shadowsocksR-debian
@@ -15,6 +15,7 @@
 NAME=ShadowsocksR
 BIN=/usr/local/shadowsocks/server.py
 CONF=/etc/shadowsocks.json
+RETVAL=0
 
 check_running(){
     PID=`ps -ef | grep -v grep | grep -i "${BIN}" | awk '{print $2}'`
@@ -28,16 +29,15 @@ check_running(){
 do_start(){
     check_running
     if [ $? -eq 0 ]; then
-        echo "$NAME is already running with PID $PID"
-        RETVAL=1
+        echo "$NAME (pid $PID) is already running..."
+        exit 0
     else
         $BIN -c $CONF -d start
         RETVAL=$?
         if [ $RETVAL -eq 0 ]; then
-            echo "$NAME start success"
+            echo "Starting $NAME success"
         else
-            echo "$NAME start failed"
-            RETVAL=1
+            echo "Starting $NAME failed"
         fi
     fi
 }
@@ -48,13 +48,12 @@ do_stop(){
         $BIN -c $CONF -d stop
         RETVAL=$?
         if [ $RETVAL -eq 0 ]; then
-            echo "$NAME stop success"
+            echo "Stopping $NAME success"
         else
-            echo "$NAME stop failed"
-            RETVAL=1
+            echo "Stopping $NAME failed"
         fi
     else
-        echo "$NAME is not running"
+        echo "$NAME is stopped"
         RETVAL=1
     fi
 }
@@ -62,17 +61,16 @@ do_stop(){
 do_status(){
     check_running
     if [ $? -eq 0 ]; then
-        echo "$NAME is running with PID $PID"
-        RETVAL=0
+        echo "$NAME (pid $PID) is running..."
     else
-        echo "$NAME is not running"
+        echo "$NAME is stopped"
         RETVAL=1
     fi
 }
 
 do_restart(){
-  do_stop
-  do_start
+    do_stop
+    do_start
 }
 
 case "$1" in