diff --git a/build/script/build.bat b/build/pack/build.bat similarity index 96% rename from build/script/build.bat rename to build/pack/build.bat index c9e1a6b..18c28ad 100644 --- a/build/script/build.bat +++ b/build/pack/build.bat @@ -62,6 +62,9 @@ copy %GOPATH%\bin\tank.exe %distPath% echo copying build xcopy %GOPATH%\src\tank\build %distPath% /e/h +echo "remove pack" +rmdir /s/q %distPath%\pack + cd %PRE_DIR% echo check the dist file in %distPath% diff --git a/build/script/build.sh b/build/pack/build.sh old mode 100755 new mode 100644 similarity index 95% rename from build/script/build.sh rename to build/pack/build.sh index b5391e2..67ae8bb --- a/build/script/build.sh +++ b/build/pack/build.sh @@ -56,6 +56,9 @@ cp "$GOPATH/bin/tank" $distPath echo "copying build" cp -r "$GOPATH/src/tank/build/." $distPath +echo "remove pack" +rm -rf $distPath/pack + cd $PRE_DIR echo "check the dist file in $distPath" diff --git a/build/script/startup.sh b/build/script/startup.sh deleted file mode 100644 index 8dc806c..0000000 --- a/build/script/startup.sh +++ /dev/null @@ -1,22 +0,0 @@ -#!/bin/bash - -# executable path -EXE_PATH=$GOPATH/bin/tank - -# execute arguments -MysqlHost=127.0.0.1 -MysqlPort=3306 -MysqlSchema=tank -MysqlUserName=tank -MysqlPassword=Tank_123 - -AdminUsername=admin -AdminEmail=lish516@126.com -AdminPassword=123456 - -if [ -f "$EXE_PATH" ]; then - nohup $EXE_PATH -MysqlHost=$MysqlHost -MysqlPort=$MysqlPort -MysqlSchema=$MysqlSchema -MysqlUserName=$MysqlUserName -MysqlPassword=$MysqlPassword -AdminUsername=$AdminUsername -AdminEmail=$AdminEmail -AdminPassword=$AdminPassword >/dev/null 2>&1 & -else - echo 'Cannot find $EXE_PATH.' - exit 1 -fi diff --git a/build/script/update.sh b/build/script/update.sh deleted file mode 100644 index 35d0228..0000000 --- a/build/script/update.sh +++ /dev/null @@ -1,27 +0,0 @@ -#!/bin/sh - -homePath=$GOPATH/src/tank - -oldPath=$(pwd) - -echo "cd homePath" -cd $homePath - -echo "shutdown tank" -source $homePath/build/script/shutdown.sh - -echo "git reset" -git reset --hard HEAD - -echo "git pull" -git pull - -echo "go install tank" -go install tank - -cd $oldPath - -echo "startup tank" -source $homePath/doc/script/startup.sh - - diff --git a/build/service/shutdown.sh b/build/service/shutdown.sh new file mode 100644 index 0000000..71b6c24 --- /dev/null +++ b/build/service/shutdown.sh @@ -0,0 +1,14 @@ +#!/bin/bash + +DIR="$( cd "$( dirname "$0" )" && pwd )" +EXE_PATH=$DIR/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/startup.sh b/build/service/startup.sh new file mode 100644 index 0000000..ee0f0db --- /dev/null +++ b/build/service/startup.sh @@ -0,0 +1,12 @@ +#!/bin/bash + +# executable path +DIR="$( cd "$( dirname "$0" )" && pwd )" +EXE_PATH=$DIR/tank + +if [ -f "$EXE_PATH" ]; then + nohup $EXE_PATH >/dev/null 2>&1 & +else + echo 'Cannot find $EXE_PATH.' + exit 1 +fi