Merge branch 'develop' of https://github.com/taosdata/TDengine into develop

tests/script/sh/cfg.sh

@@ -33,8 +33,8 @@ SCRIPT_DIR=`dirname $0`
 cd $SCRIPT_DIR/../
 SCRIPT_DIR=`pwd`
 
-TDINTERNAL="TDinternal"
-if [[ "$SCRIPT_DIR" == *"$TDINTERNAL"* ]]; then
+IN_TDINTERNAL="community"
+if [[ "$SCRIPT_DIR" == *"$IN_TDINTERNAL"* ]]; then
   cd ../../..
 else
   cd ../../

tests/script/sh/clear.sh

@@ -36,8 +36,8 @@ cd $SCRIPT_DIR/../
 SCRIPT_DIR=`pwd`
 echo "SCRIPT_DIR: $SCRIPT_DIR" 
 
-TDINTERNAL="TDinternal"
-if [[ "$SCRIPT_DIR" == *"$TDINTERNAL"* ]]; then
+IN_TDINTERNAL="community"
+if [[ "$SCRIPT_DIR" == *"$IN_TDINTERNAL"* ]]; then
   cd ../../..
 else
   cd ../../

tests/script/sh/deploy.sh

@@ -31,8 +31,8 @@ cd $SCRIPT_DIR/../
 SCRIPT_DIR=`pwd`
 echo "SCRIPT_DIR: $SCRIPT_DIR" 
 
-TDINTERNAL="TDinternal"
-if [[ "$SCRIPT_DIR" == *"$TDINTERNAL"* ]]; then
+IN_TDINTERNAL="community"
+if [[ "$SCRIPT_DIR" == *"$IN_TDINTERNAL"* ]]; then
   cd ../../..
 else
   cd ../../

tests/script/sh/exec.sh

@@ -42,8 +42,8 @@ SCRIPT_DIR=`dirname $0`
 cd $SCRIPT_DIR/../
 SCRIPT_DIR=`pwd`
 
-TDINTERNAL="TDinternal"
-if [[ "$SCRIPT_DIR" == *"$TDINTERNAL"* ]]; then
+IN_TDINTERNAL="community"
+if [[ "$SCRIPT_DIR" == *"$IN_TDINTERNAL"* ]]; then
   cd ../../..
 else
   cd ../../
@@ -95,7 +95,7 @@ else
   if [ -n "$PID" ]; then 
     if [ "$SIGNAL" = "SIGINT" ]; then 
       echo killed by signal
-      kill -sigint $PID
+      kill -SIGINT $PID
     else
       kill -9 $PID
     fi

tests/script/sh/exec_tarbitrator.sh

@@ -39,8 +39,8 @@ SCRIPT_DIR=`dirname $0`
 cd $SCRIPT_DIR/../
 SCRIPT_DIR=`pwd`
 
-TDINTERNAL="TDinternal"
-if [[ "$SCRIPT_DIR" == *"$TDINTERNAL"* ]]; then
+IN_TDINTERNAL="community"
+if [[ "$SCRIPT_DIR" == *"$IN_TDINTERNAL"* ]]; then
   cd ../../..
 else
   cd ../../

tests/script/test.sh

@@ -41,8 +41,8 @@ cd .
 CODE_DIR=`dirname $0`
 CODE_DIR=`pwd`
 
-TDINTERNAL="TDinternal"
-if [[ "$CODE_DIR" == *"$TDINTERNAL"* ]]; then
+IN_TDINTERNAL="community"
+if [[ "$CODE_DIR" == *"$IN_TDINTERNAL"* ]]; then
   cd ../../..
 else
   cd ../../