From f93fb433c716fdef43c6c593e23a25087e216453 Mon Sep 17 00:00:00 2001 From: Teddysun Date: Thu, 7 Jun 2018 21:54:59 +0900 Subject: [PATCH] Update comments Signed-off-by: Teddysun --- shadowsocks | 12 ++++++------ shadowsocks-debian | 12 ++++++------ shadowsocks-go | 10 +++++----- shadowsocks-go-debian | 10 +++++----- shadowsocks-libev | 4 ++-- shadowsocks-libev-debian | 4 ++-- shadowsocksR | 8 ++++---- shadowsocksR-debian | 8 ++++---- 8 files changed, 34 insertions(+), 34 deletions(-) diff --git a/shadowsocks b/shadowsocks index dd37f40b..ab001030 100644 --- a/shadowsocks +++ b/shadowsocks @@ -14,12 +14,12 @@ # Author: Teddysun +NAME=Shadowsocks if [ -f /usr/bin/ssserver ]; then - BIN=/usr/bin/ssserver + DAEMON=/usr/bin/ssserver elif [ -f /usr/local/bin/ssserver ]; then - BIN=/usr/local/bin/ssserver + DAEMON=/usr/local/bin/ssserver fi -NAME=Shadowsocks if [ -f /etc/shadowsocks-python/config.json ]; then CONF=/etc/shadowsocks-python/config.json elif [ -f /etc/shadowsocks.json ]; then @@ -28,7 +28,7 @@ fi RETVAL=0 check_running(){ - PID=$(ps -ef | grep -v grep | grep -i "${BIN}" | awk '{print $2}') + PID=$(ps -ef | grep -v grep | grep -i "${DAEMON}" | awk '{print $2}') if [ -n "$PID" ]; then return 0 else @@ -42,7 +42,7 @@ do_start(){ echo "$NAME (pid $PID) is already running..." exit 0 else - $BIN -c $CONF -d start + $DAEMON -c $CONF -d start RETVAL=$? if [ $RETVAL -eq 0 ]; then echo "Starting $NAME success" @@ -55,7 +55,7 @@ do_start(){ do_stop(){ check_running if [ $? -eq 0 ]; then - $BIN -c $CONF -d stop + $DAEMON -c $CONF -d stop RETVAL=$? if [ $RETVAL -eq 0 ]; then echo "Stopping $NAME success" diff --git a/shadowsocks-debian b/shadowsocks-debian index d5dbbde5..b0fe0c01 100644 --- a/shadowsocks-debian +++ b/shadowsocks-debian @@ -12,12 +12,12 @@ # Author: Teddysun +NAME=Shadowsocks if [ -f /usr/bin/ssserver ]; then - BIN=/usr/bin/ssserver + DAEMON=/usr/bin/ssserver elif [ -f /usr/local/bin/ssserver ]; then - BIN=/usr/local/bin/ssserver + DAEMON=/usr/local/bin/ssserver fi -NAME=Shadowsocks if [ -f /etc/shadowsocks-python/config.json ]; then CONF=/etc/shadowsocks-python/config.json elif [ -f /etc/shadowsocks.json ]; then @@ -26,7 +26,7 @@ fi RETVAL=0 check_running(){ - PID=$(ps -ef | grep -v grep | grep -i "${BIN}" | awk '{print $2}') + PID=$(ps -ef | grep -v grep | grep -i "${DAEMON}" | awk '{print $2}') if [ -n "$PID" ]; then return 0 else @@ -40,7 +40,7 @@ do_start(){ echo "$NAME (pid $PID) is already running..." exit 0 else - $BIN -c $CONF -d start + $DAEMON -c $CONF -d start RETVAL=$? if [ $RETVAL -eq 0 ]; then echo "Starting $NAME success" @@ -53,7 +53,7 @@ do_start(){ do_stop(){ check_running if [ $? -eq 0 ]; then - $BIN -c $CONF -d stop + $DAEMON -c $CONF -d stop RETVAL=$? if [ $RETVAL -eq 0 ]; then echo "Stopping $NAME success" diff --git a/shadowsocks-go b/shadowsocks-go index 9c391f06..368a9e96 100644 --- a/shadowsocks-go +++ b/shadowsocks-go @@ -21,7 +21,7 @@ [ ${NETWORKING} ="yes" ] || exit 0 NAME=Shadowsocks-go -BIN=/usr/bin/shadowsocks-server +DAEMON=/usr/bin/shadowsocks-server if [ -f /etc/shadowsocks-go/config.json ]; then CONF=/etc/shadowsocks-go/config.json elif [ -f /etc/shadowsocks/config.json ]; then @@ -31,19 +31,19 @@ PID_DIR=/var/run PID_FILE=$PID_DIR/shadowsocks-go.pid RET_VAL=0 -[ -x $BIN ] || exit 0 +[ -x $DAEMON ] || exit 0 if [ ! -d $PID_DIR ]; then mkdir -p $PID_DIR if [ $? -ne 0 ]; then echo "Creating PID directory $PID_DIR failed" - exit 1 + RET_VAL=1 fi fi if [ ! -f $CONF ]; then echo "$NAME config file $CONF not found" - exit 1 + RET_VAL=1 fi check_running() { @@ -78,7 +78,7 @@ do_start() { echo "$NAME (pid $PID) is already running..." return 0 fi - $BIN -c $CONF 2>&1 > /dev/null & + $DAEMON -c $CONF 2>&1 > /dev/null & PID=$! echo $PID > $PID_FILE sleep 0.3 diff --git a/shadowsocks-go-debian b/shadowsocks-go-debian index f45da703..18826fe0 100644 --- a/shadowsocks-go-debian +++ b/shadowsocks-go-debian @@ -13,7 +13,7 @@ # Author: Teddysun NAME=Shadowsocks-go -BIN=/usr/bin/shadowsocks-server +DAEMON=/usr/bin/shadowsocks-server if [ -f /etc/shadowsocks-go/config.json ]; then CONF=/etc/shadowsocks-go/config.json elif [ -f /etc/shadowsocks/config.json ]; then @@ -23,19 +23,19 @@ PID_DIR=/var/run PID_FILE=$PID_DIR/shadowsocks-go.pid RET_VAL=0 -[ -x $BIN ] || exit 0 +[ -x $DAEMON ] || exit 0 if [ ! -d $PID_DIR ]; then mkdir -p $PID_DIR if [ $? -ne 0 ]; then echo "Creating PID directory $PID_DIR failed" - exit 1 + RET_VAL=1 fi fi if [ ! -f $CONF ]; then echo "$NAME config file $CONF not found" - exit 1 + RET_VAL=1 fi check_running() { @@ -70,7 +70,7 @@ do_start() { echo "$NAME (pid $PID) is already running..." return 0 fi - $BIN -c $CONF 2>&1 > /dev/null & + $DAEMON -c $CONF 2>&1 > /dev/null & PID=$! echo $PID > $PID_FILE sleep 0.3 diff --git a/shadowsocks-libev b/shadowsocks-libev index 220eb153..d6425603 100644 --- a/shadowsocks-libev +++ b/shadowsocks-libev @@ -30,13 +30,13 @@ if [ ! -d $PID_DIR ]; then mkdir -p $PID_DIR if [ $? -ne 0 ]; then echo "Creating PID directory $PID_DIR failed" - exit 1 + RET_VAL=1 fi fi if [ ! -f $CONF ]; then echo "$NAME config file $CONF not found" - exit 1 + RET_VAL=1 fi check_running() { diff --git a/shadowsocks-libev-debian b/shadowsocks-libev-debian index f6360f84..6be74a99 100644 --- a/shadowsocks-libev-debian +++ b/shadowsocks-libev-debian @@ -29,13 +29,13 @@ if [ ! -d $PID_DIR ]; then mkdir -p $PID_DIR if [ $? -ne 0 ]; then echo "Creating PID directory $PID_DIR failed" - exit 1 + RET_VAL=1 fi fi if [ ! -f $CONF ]; then echo "$NAME config file $CONF not found" - exit 1 + RET_VAL=1 fi check_running() { diff --git a/shadowsocksR b/shadowsocksR index bf148ae8..88420d5a 100644 --- a/shadowsocksR +++ b/shadowsocksR @@ -15,7 +15,7 @@ # Author: Teddysun NAME=ShadowsocksR -BIN=/usr/local/shadowsocks/server.py +DAEMON=/usr/local/shadowsocks/server.py if [ -f /etc/shadowsocks-r/config.json ]; then CONF=/etc/shadowsocks-r/config.json elif [ -f /etc/shadowsocks.json ]; then @@ -24,7 +24,7 @@ fi RETVAL=0 check_running(){ - PID=$(ps -ef | grep -v grep | grep -i "${BIN}" | awk '{print $2}') + PID=$(ps -ef | grep -v grep | grep -i "${DAEMON}" | awk '{print $2}') if [ -n "$PID" ]; then return 0 else @@ -38,7 +38,7 @@ do_start(){ echo "$NAME (pid $PID) is already running..." exit 0 else - $BIN -c $CONF -d start + $DAEMON -c $CONF -d start RETVAL=$? if [ $RETVAL -eq 0 ]; then echo "Starting $NAME success" @@ -51,7 +51,7 @@ do_start(){ do_stop(){ check_running if [ $? -eq 0 ]; then - $BIN -c $CONF -d stop + $DAEMON -c $CONF -d stop RETVAL=$? if [ $RETVAL -eq 0 ]; then echo "Stopping $NAME success" diff --git a/shadowsocksR-debian b/shadowsocksR-debian index 73275466..adb2b767 100644 --- a/shadowsocksR-debian +++ b/shadowsocksR-debian @@ -13,7 +13,7 @@ # Author: Teddysun NAME=ShadowsocksR -BIN=/usr/local/shadowsocks/server.py +DAEMON=/usr/local/shadowsocks/server.py if [ -f /etc/shadowsocks-r/config.json ]; then CONF=/etc/shadowsocks-r/config.json elif [ -f /etc/shadowsocks.json ]; then @@ -22,7 +22,7 @@ fi RETVAL=0 check_running(){ - PID=$(ps -ef | grep -v grep | grep -i "${BIN}" | awk '{print $2}') + PID=$(ps -ef | grep -v grep | grep -i "${DAEMON}" | awk '{print $2}') if [ -n "$PID" ]; then return 0 else @@ -36,7 +36,7 @@ do_start(){ echo "$NAME (pid $PID) is already running..." exit 0 else - $BIN -c $CONF -d start + $DAEMON -c $CONF -d start RETVAL=$? if [ $RETVAL -eq 0 ]; then echo "Starting $NAME success" @@ -49,7 +49,7 @@ do_start(){ do_stop(){ check_running if [ $? -eq 0 ]; then - $BIN -c $CONF -d stop + $DAEMON -c $CONF -d stop RETVAL=$? if [ $RETVAL -eq 0 ]; then echo "Stopping $NAME success"