diff --git a/build/pack/build.bat b/build/pack/build.bat index 18c28ad..8a1b857 100644 --- a/build/pack/build.bat +++ b/build/pack/build.bat @@ -65,6 +65,9 @@ xcopy %GOPATH%\src\tank\build %distPath% /e/h echo "remove pack" rmdir /s/q %distPath%\pack +echo "remove service" +rmdir /s/q %distPath%\service + cd %PRE_DIR% echo check the dist file in %distPath% diff --git a/build/script/shutdown.sh b/build/script/shutdown.sh deleted file mode 100644 index cbfcd81..0000000 --- a/build/script/shutdown.sh +++ /dev/null @@ -1,14 +0,0 @@ -#!/bin/bash - - -EXE_PATH=$GOPATH/bin/tank - -EDASPID=`ps -ef | grep "$EXE_PATH"|grep -v grep |head -n 1 | awk '{print $2}'` -if [ -z $EDASPID ]; -then - echo "Cannot find $EXE_PATH." -else - kill -9 $EDASPID - echo $EXE_PATH - echo 'Shutdown successfully.' -fi \ No newline at end of file diff --git a/build/service/shutdown.sh b/build/service/shutdown.sh index 71b6c24..6eb96a3 100644 --- a/build/service/shutdown.sh +++ b/build/service/shutdown.sh @@ -1,7 +1,8 @@ #!/bin/bash DIR="$( cd "$( dirname "$0" )" && pwd )" -EXE_PATH=$DIR/tank +TANK_DIR=$(dirname $DIR) +EXE_PATH=$TANK_DIR/tank EDASPID=`ps -ef | grep "$EXE_PATH"|grep -v grep |head -n 1 | awk '{print $2}'` if [ -z $EDASPID ]; diff --git a/build/service/startup.sh b/build/service/startup.sh index ee0f0db..cc644ed 100644 --- a/build/service/startup.sh +++ b/build/service/startup.sh @@ -2,7 +2,9 @@ # executable path DIR="$( cd "$( dirname "$0" )" && pwd )" -EXE_PATH=$DIR/tank +TANK_DIR=$(dirname $DIR) +EXE_PATH=$TANK_DIR/tank + if [ -f "$EXE_PATH" ]; then nohup $EXE_PATH >/dev/null 2>&1 &