Merge branch 'develop' into CI/TD-12111

.gitignore

@@ -86,7 +86,6 @@ tests/script/api/batchprepare
 tests/script/api/stmt
 tests/script/api/stmtBatchTest
 tests/script/api/stmtTest
-
 # Emacs
 # -*- mode: gitignore; -*-
 *~

Jenkinsfile

@@ -433,7 +433,7 @@ pipeline {
         stage('python_3') {
           agent{label " slave3 || slave8 || slave13 ||slave18 "}
           steps {
-            timeout(time: 55, unit: 'MINUTES'){
+            timeout(time: 105, unit: 'MINUTES'){
               pre_test()
               script{
               scope.each {

cmake/define.inc

@@ -265,7 +265,7 @@ IF (TD_WINDOWS)
   ADD_DEFINITIONS(-D_MBCS -D_CRT_SECURE_NO_DEPRECATE -D_CRT_NONSTDC_NO_DEPRECATE)
   SET(CMAKE_GENERATOR "NMake Makefiles" CACHE INTERNAL "" FORCE)
   IF (NOT TD_GODLL)
-    SET(COMMON_FLAGS "/nologo /WX /wd4018 /wd5999 /Oi /Oy- /Gm- /EHsc /MT /GS /Gy /fp:precise /Zc:wchar_t /Zc:forScope /Gd /errorReport:prompt /analyze-")
+    SET(COMMON_FLAGS "/nologo /WX /wd4018 /wd4999 /Oi /Oy- /Gm- /EHsc /MT /GS /Gy /fp:precise /Zc:wchar_t /Zc:forScope /Gd /errorReport:prompt /analyze-")
     IF (MSVC AND (MSVC_VERSION GREATER_EQUAL 1900))
       SET(COMMON_FLAGS "${COMMON_FLAGS} /Wv:18")
     ENDIF ()

jemalloc @ 9015e129

-Subproject commit ea6b3e973b477b8061e0076bb257dbd7f3faa756
+Subproject commit 9015e129bd7de389afa4196495451669700904d0

documentation20/cn/00.index/docs.md

@@ -83,9 +83,10 @@ TDengine是一个高效的存储、查询、分析时序大数据的平台，专
 * [Windows客户端](https://www.taosdata.com/blog/2019/07/26/514.html)：自行编译windows客户端，Windows环境的各种连接器都需要它
 * [Rust Connector](/connector/rust): Rust语言下通过libtaos客户端或RESTful接口，连接TDengine服务器。
 
-## [TDengine 组件与工具](/tools/adapter)
+## [TDengine 组件与工具](/cn/documentation/)
 
-* [taosAdapter用户手册](/tools/adapter)
+* [taosAdapter 用户手册](/tools/adapter)
+* [TDinsight 用户手册](/tools/insight)
 
 ## [与其他工具的连接](/connections)
 

documentation20/cn/08.connector/01.java/docs.md

@@ -331,49 +331,238 @@ JDBC连接器可能报错的错误码包括3种：JDBC driver本身的报错（
 
 ### <a class="anchor" id="stmt-java"></a>通过参数绑定写入数据
 
-从 2.1.2.0 版本开始，TDengine 的 **JDBC-JNI** 实现大幅改进了参数绑定方式对数据写入（INSERT）场景的支持。采用这种方式写入数据时，能避免 SQL 语法解析的资源消耗，从而在很多情况下显著提升写入性能。（注意：**JDBC-RESTful** 实现并不提供参数绑定这种使用方式。）
-
+从 2.1.2.0 版本开始，TDengine 的 JDBC-JNI 实现大幅改进了参数绑定方式对数据写入（INSERT）场景的支持。采用这种方式写入数据时，能避免 SQL 语法解析的资源消耗，从而在很多情况下显著提升写入性能。
+注意：
+* JDBC-RESTful 实现并不提供参数绑定这种使用方式
+* 以下示例代码基于taos-jdbcdriver-2.0.36
+* binary类型数据需要调用setString方法，nchar类型数据需要调用setNString方法
+* setString 和 setNString 都要求用户在 size 参数里声明表定义中对应列的列宽
+
+示例代码：
 ```java
-Random r = new Random();
+public class ParameterBindingDemo {
+ 
+    private static final String host = "127.0.0.1";
+    private static final Random random = new Random(System.currentTimeMillis());
+    private static final int BINARY_COLUMN_SIZE = 20;
+    private static final String[] schemaList = {
+            "create table stable1(ts timestamp, f1 tinyint, f2 smallint, f3 int, f4 bigint) tags(t1 tinyint, t2 smallint, t3 int, t4 bigint)",
+            "create table stable2(ts timestamp, f1 float, f2 double) tags(t1 float, t2 double)",
+            "create table stable3(ts timestamp, f1 bool) tags(t1 bool)",
+            "create table stable4(ts timestamp, f1 binary(" + BINARY_COLUMN_SIZE + ")) tags(t1 binary(" + BINARY_COLUMN_SIZE + "))",
+            "create table stable5(ts timestamp, f1 nchar(" + BINARY_COLUMN_SIZE + ")) tags(t1 nchar(" + BINARY_COLUMN_SIZE + "))"
+    };
+    private static final int numOfSubTable = 10, numOfRow = 10;
  
-// INSERT 语句中，VALUES 部分允许指定具体的数据列；如果采取自动建表，则 TAGS 部分需要设定全部 TAGS 列的参数值：
-TSDBPreparedStatement s = (TSDBPreparedStatement) conn.prepareStatement("insert into ? using weather_test tags (?, ?) (ts, c1, c2) values(?, ?, ?)");
+    public static void main(String[] args) throws SQLException {
  
-// 设定数据表名：
-s.setTableName("w1");
-// 设定 TAGS 取值：
-s.setTagInt(0, r.nextInt(10));
-s.setTagString(1, "Beijing");
+        String jdbcUrl = "jdbc:TAOS://" + host + ":6030/";
+        Connection conn = DriverManager.getConnection(jdbcUrl, "root", "taosdata");
  
-int numOfRows = 10;
+        init(conn);
  
-// VALUES 部分以逐列的方式进行设置：
-ArrayList<Long> ts = new ArrayList<>();
-for (int i = 0; i < numOfRows; i++){
-    ts.add(System.currentTimeMillis() + i);
-}
-s.setTimestamp(0, ts);
+        bindInteger(conn);
  
-ArrayList<Integer> s1 = new ArrayList<>();
-for (int i = 0; i < numOfRows; i++){
-    s1.add(r.nextInt(100));
-}
-s.setInt(1, s1);
+        bindFloat(conn);
+ 
+        bindBoolean(conn);
+ 
+        bindBytes(conn);
+ 
+        bindString(conn);
+ 
+        conn.close();
+    }
+ 
+    private static void init(Connection conn) throws SQLException {
+        try (Statement stmt = conn.createStatement()) {
+            stmt.execute("drop database if exists test_parabind");
+            stmt.execute("create database if not exists test_parabind");
+            stmt.execute("use test_parabind");
+            for (int i = 0; i < schemaList.length; i++) {
+                stmt.execute(schemaList[i]);
+            }
+        }
+    }
+ 
+    private static void bindInteger(Connection conn) throws SQLException {
+        String sql = "insert into ? using stable1 tags(?,?,?,?) values(?,?,?,?,?)";
+ 
+        try (TSDBPreparedStatement pstmt = conn.prepareStatement(sql).unwrap(TSDBPreparedStatement.class)) {
+ 
+            for (int i = 1; i <= numOfSubTable; i++) {
+                // set table name
+                pstmt.setTableName("t1_" + i);
+                // set tags
+                pstmt.setTagByte(0, Byte.parseByte(Integer.toString(random.nextInt(Byte.MAX_VALUE))));
+                pstmt.setTagShort(1, Short.parseShort(Integer.toString(random.nextInt(Short.MAX_VALUE))));
+                pstmt.setTagInt(2, random.nextInt(Integer.MAX_VALUE));
+                pstmt.setTagLong(3, random.nextLong());
+                // set columns
+                ArrayList<Long> tsList = new ArrayList<>();
+                long current = System.currentTimeMillis();
+                for (int j = 0; j < numOfRow; j++)
+                    tsList.add(current + j);
+                pstmt.setTimestamp(0, tsList);
+ 
+                ArrayList<Byte> f1List = new ArrayList<>();
+                for (int j = 0; j < numOfRow; j++)
+                    f1List.add(Byte.parseByte(Integer.toString(random.nextInt(Byte.MAX_VALUE))));
+                pstmt.setByte(1, f1List);
+ 
+                ArrayList<Short> f2List = new ArrayList<>();
+                for (int j = 0; j < numOfRow; j++)
+                    f2List.add(Short.parseShort(Integer.toString(random.nextInt(Short.MAX_VALUE))));
+                pstmt.setShort(2, f2List);
+ 
+                ArrayList<Integer> f3List = new ArrayList<>();
+                for (int j = 0; j < numOfRow; j++)
+                    f3List.add(random.nextInt(Integer.MAX_VALUE));
+                pstmt.setInt(3, f3List);
+ 
+                ArrayList<Long> f4List = new ArrayList<>();
+                for (int j = 0; j < numOfRow; j++)
+                    f4List.add(random.nextLong());
+                pstmt.setLong(4, f4List);
+ 
+                // add column
+                pstmt.columnDataAddBatch();
+            }
+            // execute column
+            pstmt.columnDataExecuteBatch();
+        }
+    }
+ 
+    private static void bindFloat(Connection conn) throws SQLException {
+        String sql = "insert into ? using stable2 tags(?,?) values(?,?,?)";
+ 
+        TSDBPreparedStatement pstmt = conn.prepareStatement(sql).unwrap(TSDBPreparedStatement.class);
+ 
+        for (int i = 1; i <= numOfSubTable; i++) {
+            // set table name
+            pstmt.setTableName("t2_" + i);
+            // set tags
+            pstmt.setTagFloat(0, random.nextFloat());
+            pstmt.setTagDouble(1, random.nextDouble());
+            // set columns
+            ArrayList<Long> tsList = new ArrayList<>();
+            long current = System.currentTimeMillis();
+            for (int j = 0; j < numOfRow; j++)
+                tsList.add(current + j);
+            pstmt.setTimestamp(0, tsList);
+ 
+            ArrayList<Float> f1List = new ArrayList<>();
+            for (int j = 0; j < numOfRow; j++)
+                f1List.add(random.nextFloat());
+            pstmt.setFloat(1, f1List);
+ 
+            ArrayList<Double> f2List = new ArrayList<>();
+            for (int j = 0; j < numOfRow; j++)
+                f2List.add(random.nextDouble());
+            pstmt.setDouble(2, f2List);
+ 
+            // add column
+            pstmt.columnDataAddBatch();
+        }
+        // execute
+        pstmt.columnDataExecuteBatch();
+        // close if no try-with-catch statement is used
+        pstmt.close();
+    }
+ 
+    private static void bindBoolean(Connection conn) throws SQLException {
+        String sql = "insert into ? using stable3 tags(?) values(?,?)";
+ 
+        try (TSDBPreparedStatement pstmt = conn.prepareStatement(sql).unwrap(TSDBPreparedStatement.class)) {
+            for (int i = 1; i <= numOfSubTable; i++) {
+                // set table name
+                pstmt.setTableName("t3_" + i);
+                // set tags
+                pstmt.setTagBoolean(0, random.nextBoolean());
+                // set columns
+                ArrayList<Long> tsList = new ArrayList<>();
+                long current = System.currentTimeMillis();
+                for (int j = 0; j < numOfRow; j++)
+                    tsList.add(current + j);
+                pstmt.setTimestamp(0, tsList);
+ 
+                ArrayList<Boolean> f1List = new ArrayList<>();
+                for (int j = 0; j < numOfRow; j++)
+                    f1List.add(random.nextBoolean());
+                pstmt.setBoolean(1, f1List);
+ 
+                // add column
+                pstmt.columnDataAddBatch();
+            }
+            // execute
+            pstmt.columnDataExecuteBatch();
+        }
+    }
+ 
+    private static void bindBytes(Connection conn) throws SQLException {
+        String sql = "insert into ? using stable4 tags(?) values(?,?)";
+ 
+        try (TSDBPreparedStatement pstmt = conn.prepareStatement(sql).unwrap(TSDBPreparedStatement.class)) {
+ 
+            for (int i = 1; i <= numOfSubTable; i++) {
+                // set table name
+                pstmt.setTableName("t4_" + i);
+                // set tags
+                pstmt.setTagString(0, new String("abc"));
+ 
+                // set columns
+                ArrayList<Long> tsList = new ArrayList<>();
+                long current = System.currentTimeMillis();
+                for (int j = 0; j < numOfRow; j++)
+                    tsList.add(current + j);
+                pstmt.setTimestamp(0, tsList);
+ 
+                ArrayList<String> f1List = new ArrayList<>();
+                for (int j = 0; j < numOfRow; j++) {
+                    f1List.add(new String("abc"));
+                }
+                pstmt.setString(1, f1List, BINARY_COLUMN_SIZE);
+ 
+                // add column
+                pstmt.columnDataAddBatch();
+            }
+            // execute
+            pstmt.columnDataExecuteBatch();
+        }
+    }
+ 
+    private static void bindString(Connection conn) throws SQLException {
+        String sql = "insert into ? using stable5 tags(?) values(?,?)";
+ 
+        try (TSDBPreparedStatement pstmt = conn.prepareStatement(sql).unwrap(TSDBPreparedStatement.class)) {
+ 
+            for (int i = 1; i <= numOfSubTable; i++) {
+                // set table name
+                pstmt.setTableName("t5_" + i);
+                // set tags
+                pstmt.setTagNString(0, "北京-abc");
+ 
+                // set columns
+                ArrayList<Long> tsList = new ArrayList<>();
+                long current = System.currentTimeMillis();
+                for (int j = 0; j < numOfRow; j++)
+                    tsList.add(current + j);
+                pstmt.setTimestamp(0, tsList);
  
-ArrayList<String> s2 = new ArrayList<>();
-for (int i = 0; i < numOfRows; i++){
-    s2.add("test" + r.nextInt(100));
+                ArrayList<String> f1List = new ArrayList<>();
+                for (int j = 0; j < numOfRow; j++) {
+                    f1List.add("北京-abc");
+                }
+                pstmt.setNString(1, f1List, BINARY_COLUMN_SIZE);
+ 
+                // add column
+                pstmt.columnDataAddBatch();
+            }
+            // execute
+            pstmt.columnDataExecuteBatch();
+        }
+    }
 }
-s.setString(2, s2, 10);
-
-// AddBatch 之后，缓存并未清空。为避免混乱，并不推荐在 ExecuteBatch 之前再次绑定新一批的数据：
-s.columnDataAddBatch();
-// 执行绑定数据后的语句：
-s.columnDataExecuteBatch();
-// 执行语句后清空缓存。在清空之后，可以复用当前的对象，绑定新的一批数据（可以是新表名、新 TAGS 值、新 VALUES 值）：
-s.columnDataClearBatch();
-// 执行完毕，释放资源：
-s.columnDataCloseBatch();
 ```
 
 用于设定 TAGS 取值的方法总共有：
@@ -405,7 +594,64 @@ public void setString(int columnIndex, ArrayList<String> list, int size) throws
 public void setNString(int columnIndex, ArrayList<String> list, int size) throws SQLException
 ```
 
-其中 setString 和 setNString 都要求用户在 size 参数里声明表定义中对应列的列宽。
+### <a class="anchor" id="set-client-configuration"></a>设置客户端参数
+从TDengine-2.3.5.0版本开始，jdbc driver支持在应用的第一次连接中，设置TDengine的客户端参数。Driver支持JDBC-JNI方式中，通过jdbcUrl和properties两种方式设置client parameter。
+注意：
+* JDBC-RESTful不支持设置client parameter的功能。
+* 应用中设置的client parameter为进程级别的，即如果要更新client的参数，需要重启应用。这是因为client parameter是全局参数，仅在应用程序的第一次设置生效。
+* 以下示例代码基于taos-jdbcdriver-2.0.36。
+
+示例代码：
+```java
+public class ClientParameterSetting {
+    private static final String host = "127.0.0.1";
+ 
+    public static void main(String[] args) throws SQLException {
+        setParameterInJdbcUrl();
+ 
+        setParameterInProperties();
+    }
+ 
+    private static void setParameterInJdbcUrl() throws SQLException {
+        String jdbcUrl = "jdbc:TAOS://" + host + ":6030/?debugFlag=135&asyncLog=0";
+ 
+        Connection connection = DriverManager.getConnection(jdbcUrl, "root", "taosdata");
+ 
+        printDatabase(connection);
+ 
+        connection.close();
+    }
+ 
+    private static void setParameterInProperties() throws SQLException {
+        String jdbcUrl = "jdbc:TAOS://" + host + ":6030/";
+        Properties properties = new Properties();
+        properties.setProperty("user", "root");
+        properties.setProperty("password", "taosdata");
+        properties.setProperty("debugFlag", "135");
+        properties.setProperty("asyncLog", "0");
+        properties.setProperty("maxSQLLength", "1048576");
+ 
+        try (Connection conn = DriverManager.getConnection(jdbcUrl, properties)) {
+            printDatabase(conn);
+        }
+    }
+ 
+    private static void printDatabase(Connection connection) throws SQLException {
+        try (Statement stmt = connection.createStatement()) {
+            ResultSet rs = stmt.executeQuery("show databases");
+ 
+            ResultSetMetaData meta = rs.getMetaData();
+            while (rs.next()) {
+                for (int i = 1; i <= meta.getColumnCount(); i++) {
+                    System.out.print(meta.getColumnLabel(i) + ": " + rs.getString(i) + "\t");
+                }
+                System.out.println();
+            }
+        }
+    }
+}
+```
+
 
 ## <a class="anchor" id="subscribe"></a>订阅
 

documentation20/cn/08.connector/docs.md

@@ -55,7 +55,7 @@ TDengine提供了丰富的应用程序开发接口，其中包括C/C++、Java、
 ​    *install_client.sh*：安装脚本，用于应用驱动程序
 ​    *taos.tar.gz*：应用驱动安装包
 ​    *driver*：TDengine应用驱动driver
-​    *connector*: 各种编程语言连接器（go/grafanaplugin/nodejs/python/JDBC）
+​    *connector*: 各种编程语言连接器（go/nodejs/python/JDBC）
 ​    *examples*: 各种编程语言的示例程序(c/C#/go/JDBC/MATLAB/python/R)
 
 运行install_client.sh进行安装。
@@ -541,9 +541,8 @@ TDengine提供时间驱动的实时流式计算API。可以每隔一指定的时
 
 Python连接器的使用参见[视频教程](https://www.taosdata.com/blog/2020/11/11/1963.html)
 
-**安装**：参见下面具体步骤
-
-**示例程序**：位于install_directory/examples/python
+* **安装**：参见下面具体步骤
+* **示例程序**：位于install_directory/examples/python
 
 ### 安装
 
@@ -557,47 +556,36 @@ Python连接器支持的系统有：Linux 64/Windows x64
 
 ### Python连接器安装
 
-**Linux**
-
-用户可以在源代码的src/connector/python（或者tar.gz的/connector/python）文件夹下找到connector安装包。用户可以通过pip命令安装： 
-
-​		`pip install src/connector/python/`
+Python 连接器可以通过 `pip` 从 PyPI 下载安装。注意 TDengine Python 连接器的包名为 `taospy` 而不是 `taos`（这是一个与 TDengine 无关的另一个程序）。但为保持向后兼容性，仍然使用 `import taos` 导入。
 
-或
-
-​		`pip3 install src/connector/python/`
-
-**Windows**
-
-在已安装Windows TDengine 客户端的情况下， 将文件"C:\TDengine\driver\taos.dll" 拷贝到 "C:\Windows\system32" 目录下, 然后进入Windows *cmd* 命令行界面
 ```bash
-cd C:\TDengine\connector\python
-python -m pip install .
+pip install taospy
 ```
 
-**PyPI**
+如果不使用系统默认的 `python` 和 `pip`，则需要指定 `pip` 的版本或路径：
 
-从2.1.1版本开始，用户可以从[PyPI](https://pypi.org/project/taospy/)安装：
-
-```sh
-pip install taospy
+```bash
+pip2 install taospy
+pip3 install taospy
 ```
 
-* 如果机器上没有pip命令，用户可将src/connector/python下的taos文件夹拷贝到应用程序的目录使用。
-对于windows 客户端，安装TDengine windows 客户端后，将C:\TDengine\driver\taos.dll拷贝到C:\windows\system32目录下即可。
+Python 命令行依赖 taos 动态库 `libtaos.so` 或 `taos.dll`, 对于 Windows 客户端，安装TDengine windows 客户端后，如果不能正常 `import taos`，可以将 `C:\TDengine\driver\taos.dll` 拷贝到 `C:\windows\system32` 目录后重新尝试。
+
+对于无法联网用户，可以将TDengine客户端中的 `connector/python` 路径（Linux 下其安装路径为 `/usr/local/taos/connector/python/`，Windows 下默认安装路径为 `C:\TDengine\connector\python`）添加到 `PYTHONPATH` 环境变量中使用。
 
 ### 示例程序
 
-示例程序源码位于install_directory/examples/Python，有：
-**read_example.py       Python示例源程序**
+示例程序源码位于 `<install_directory>/examples/python`，有：
+
+* **read_example.py**       Python示例源程序
 
-用户可以参考read_example.py这个程序来设计用户自己的写入、查询程序。
+用户可以参考`read_example.py`这个程序来设计用户自己的写入、查询程序。
 
-在安装了对应的应用驱动后，通过import taos引入taos类。主要步骤如下：
+在安装了对应的应用驱动后，通过`import taos`引入taos类。主要步骤如下：
 
-- 通过taos.connect获取TDengineConnection对象，这个对象可以一个程序只申请一个，在多线程中共享。
+- 通过taos.connect获取TaosConnection对象，这个对象可以一个程序只申请一个，在多线程中共享。
 
-- 通过TDengineConnection对象的 .cursor()方法获取一个新的游标对象，这个游标对象必须保证每个线程独享。
+- 通过TaosConnection对象的 `.cursor()` 方法获取一个新的游标对象，这个游标对象必须保证每个线程独享。
 
 - 通过游标对象的execute()方法，执行写入或查询的SQL语句。
 
@@ -634,127 +622,132 @@ for row in results:
     print(row)
 ```
 
-#### 代码示例
+##### 代码示例
 
-* 导入TDengine客户端模块
+1. 导入TDengine客户端模块
 
-```python
-import taos
-```
-* 获取连接并获取游标对象
+    ```python
+    import taos
+    ```
 
-```python
-conn = taos.connect(host="127.0.0.1", user="root", password="taosdata", config="/etc/taos")
-c1 = conn.cursor()
-```
-* *host* 是TDengine 服务端所有IP, *config* 为客户端配置文件所在目录
+2. 获取连接并获取游标对象
 
-* 写入数据
+    ```python
+    conn = taos.connect(host="127.0.0.1", user="root", password="taosdata", config="/etc/taos")
+    c1 = conn.cursor()
+    ```
 
-```python
-import datetime
-
-# 创建数据库
-c1.execute('create database db')
-c1.execute('use db')
-# 建表
-c1.execute('create table tb (ts timestamp, temperature int, humidity float)')
-# 插入数据
-start_time = datetime.datetime(2019, 11, 1)
-affected_rows = c1.execute('insert into tb values (\'%s\', 0, 0.0)' %start_time)
-# 批量插入数据
-time_interval = datetime.timedelta(seconds=60)
-sqlcmd = ['insert into tb values']
-for irow in range(1,11):
+    *host* 是TDengine 服务端所在IP, *config* 为客户端配置文件所在目录。
+
+3. 写入数据
+
+    ```python
+    import datetime
+
+    # 创建数据库
+    c1.execute('create database db')
+    c1.execute('use db')
+    # 建表
+    c1.execute('create table tb (ts timestamp, temperature int, humidity float)')
+    # 插入数据
+    start_time = datetime.datetime(2019, 11, 1)
+    affected_rows = c1.execute('insert into tb values (\'%s\', 0, 0.0)' %start_time)
+    # 批量插入数据
+    time_interval = datetime.timedelta(seconds=60)
+    sqlcmd = ['insert into tb values']
+    for irow in range(1,11):
         start_time += time_interval
         sqlcmd.append('(\'%s\', %d, %f)' %(start_time, irow, irow*1.2))
-affected_rows = c1.execute(' '.join(sqlcmd))
-```
+    affected_rows = c1.execute(' '.join(sqlcmd))
+    ```
 
-* 查询数据
+4. 查询数据
 
-```python
-c1.execute('select * from tb')
-# 拉取查询结果
-data = c1.fetchall()
-# 返回的结果是一个列表，每一行构成列表的一个元素
-numOfRows = c1.rowcount
-numOfCols = len(c1.description)
-for irow in range(numOfRows):
-  print("Row%d: ts=%s, temperature=%d, humidity=%f" %(irow, data[irow][0], data[irow][1],data[irow][2]))
-
-# 直接使用cursor 循环拉取查询结果
-c1.execute('select * from tb')
-for data in c1:
-  print("ts=%s, temperature=%d, humidity=%f" %(data[0], data[1],data[2]))
-```
+    ```python
+    c1.execute('select * from tb')
+    # 拉取查询结果
+    data = c1.fetchall()
+    # 返回的结果是一个列表，每一行构成列表的一个元素
+    numOfRows = c1.rowcount
+    numOfCols = len(c1.description)
+    for irow in range(numOfRows):
+        print("Row%d: ts=%s, temperature=%d, humidity=%f" %(irow, data[irow][0], data[irow][1], data[irow][2]))
+
+    # 直接使用cursor 循环拉取查询结果
+    c1.execute('select * from tb')
+    for data in c1:
+        print("ts=%s, temperature=%d, humidity=%f" %(data[0], data[1], data[2]))
+    ```
 
-* 从v2.1.0版本开始, 我们提供另外一种API：`connection.query`
+#### Query API
 
-    ```python
-    import taos
+从v2.1.0版本开始, 我们提供另外一种方法：`connection.query` 来操作数据库。
+
+```python
+import taos
 
-    conn = taos.connect()
-    conn.execute("create database if not exists pytest")
+conn = taos.connect()
+conn.execute("create database if not exists pytest")
 
-    result = conn.query("show databases")
-    num_of_fields = result.field_count
-    for field in result.fields:
+result = conn.query("show databases")
+num_of_fields = result.field_count
+for field in result.fields:
     print(field)
-    for row in result:
+for row in result:
     print(row)
-    conn.execute("drop database pytest")
-    ```
+conn.execute("drop database pytest")
+```
 
-    `query` 方法会返回一个 `TaosResult` 类对象，并提供了以下有用的属性或方法:
+`query` 方法会返回一个 `TaosResult` 对象，并提供了以下属性或方法:
 
-    属性:
+属性:
 
-    - `fields`: `TaosFields` 集合类，提供返回数据的列信息。
-    - `field_count`: 返回数据的列数.
-    - `affected_rows`: 插入数据的行数.
-    - `row_count`: 查询数据结果数.
-    - `precision`: 当前数据库的时间精度.
+- `fields`: `TaosFields` 集合类，提供返回数据的列信息。
+- `field_count`: 返回数据的列数.
+- `affected_rows`: 插入数据的行数.
+- `row_count`: 查询数据结果数.
+- `precision`: 当前数据库的时间精度.
 
-    方法:
+方法:
 
-    - `fetch_all()`: 类似于 `cursor.fetchall()` 返回同样的集合数据
-    - `fetch_all_into_dict()`: v2.1.1 新添加的API，将上面的数据转换成字典类型返回
-    - `blocks_iter()` `rows_iter()`: 根据底层API提供的两种不同迭代器。
-    - `fetch_rows_a`: 异步API
-    - `errno`: 错误码
-    - `errstr`: 错误信息
-    - `close`: 关闭结果对象，一般不需要直接调用
+- `fetch_all()`: 类似于 `cursor.fetchall()` 返回同样的集合数据
+- `fetch_all_into_dict()`: v2.1.1 新添加的API，将上面的数据转换成字典类型返回
+- `blocks_iter()` `rows_iter()`: 根据底层API提供的两种不同迭代器。
+- `fetch_rows_a`: 异步API
+- `errno`: 错误码
+- `errstr`: 错误信息
+- `close`: 关闭结果对象，一般不需要直接调用
 
+#### 订阅 API
 
-* 创建订阅
+1. 创建一个同步订阅队列：
 
-```python
-# 创建一个主题为 'test' 消费周期为1000毫秒的订阅
-# 第一个参数为 True 表示重新开始订阅，如为 False 且之前创建过主题为 'test' 的订阅，则表示继续消费此订阅的数据，而不是重新开始消费所有数据
-sub = conn.subscribe(True, "test", "select * from tb;", 1000)
-```
+    ```python
+    # 创建一个主题为 'test' 消费周期为1000毫秒的订阅
+    #   第一个参数为 True 表示重新开始订阅，如为 False 且之前创建过主题为 'test' 的订阅，
+    #   则表示继续消费此订阅的数据，而不是重新开始消费所有数据
+    sub = conn.subscribe(True, "test", "select * from tb;", 1000)
+    ```
 
-* 消费订阅的数据
+2. 消费订阅的数据
 
-```python
-data = sub.consume()
-for d in data:
+    ```python
+    data = sub.consume()
+    for d in data:
         print(d)
-```
+    ```
 
-* 取消订阅
+3. 取消订阅
 
-```python
-sub.close()
-```
+    ```python
+    sub.close()
+    ```
 
-* 关闭连接
+4. 关闭连接
 
-```python
-c1.close()
-conn.close()
-```
+    ```python
+    conn.close()
+    ```
 
 #### 关于纳秒 (nanosecond) 在 Python 连接器中的说明
 
@@ -767,30 +760,20 @@ conn.close()
 
 用户可通过python的帮助信息直接查看模块的使用信息，或者参考tests/examples/python中的示例程序。以下为部分常用类和方法：
 
-- _TDengineConnection_ 类
+- _TaosConnection_ 类
 
-  参考python中help(taos.TDengineConnection)。
+  参考python中help(taos.TaosConnection)。
   这个类对应客户端和TDengine建立的一个连接。在客户端多线程的场景下，推荐每个线程申请一个独立的连接实例，而不建议多线程共享一个连接。
 
-- _TDengineCursor_ 类
+- _TaosCursor_ 类
 
-  参考python中help(taos.TDengineCursor)。
+  参考python中help(taos.TaosCursor)。
   这个类对应客户端进行的写入、查询操作。在客户端多线程的场景下，这个游标实例必须保持线程独享，不能跨线程共享使用，否则会导致返回结果出现错误。
 
 - _connect_ 方法
 
-  用于生成taos.TDengineConnection的实例。
-
-### Python客户端使用示例代码
+  用于生成taos.TaosConnection的实例。
 
-在tests/examples/python中，我们提供了一个示例Python程序read_example.py，可以参考这个程序来设计用户自己的写入、查询程序。在安装了对应的客户端后，通过import taos引入taos类。主要步骤如下
-
-- 通过taos.connect获取TDengineConnection对象，这个对象可以一个程序只申请一个，在多线程中共享。
-- 通过TDengineConnection对象的 .cursor()方法获取一个新的游标对象，这个游标对象必须保证每个线程独享。
-- 通过游标对象的execute()方法，执行写入或查询的SQL语句。
-- 如果执行的是写入语句，execute返回的是成功写入的行数信息affected rows。
-- 如果执行的是查询语句，则execute执行成功后，需要通过fetchall方法去拉取结果集。
-具体方法可以参考示例代码。
 
 ## <a class="anchor" id="restful"></a>RESTful Connector
 

documentation20/cn/09.connections/docs.md

@@ -14,7 +14,7 @@ TDengine 能够与开源数据可视化系统 [Grafana](https://www.grafana.com/
 TDengine 的 Grafana 插件请从 <https://github.com/taosdata/grafanaplugin/releases/latest> 下载。
 
 ```bash
-GF_VERSION=3.1.1
+GF_VERSION=3.1.3
 wget https://github.com/taosdata/grafanaplugin/releases/download/v$GF_VERSION/tdengine-datasource-$GF_VERSION.zip
 ```
 
@@ -75,15 +75,7 @@ allow_loading_unsigned_plugins = tdengine-datasource
 
 #### 导入 Dashboard
 
-我们提供一个 TDengine Dashboard 可以作为 TDengine 集群的监控可视化工具使用，见 [Grafana Dashboard 15146](https://grafana.com/grafana/dashboards/15146)。
-
-点击左侧 `Import` 按钮，选择 **Grafana.com Dashboard**,j将id `15146` 填入并加载：
-
-![img](../images/connections/import_dashboard1.jpg)
-
-导入完成之后可看到如下效果：
-
-![img](../images/connections/dashboard-15146.png)
+在 2.3.3.0 及以上版本，您可以导入 TDinsight Dashboard (Grafana Dashboard ID： [15167](https://grafana.com/grafana/dashboards/15167)) 作为 TDengine 集群的监控可视化工具。安装和使用说明请见 [TDinsight 用户手册](https://www.taosdata.com/cn/documentation/tools/insight)。
 
 ## <a class="anchor" id="matlab"></a>MATLAB
 

documentation20/cn/10.cluster/docs.md

@@ -45,7 +45,7 @@ arbitrator            ha.taosdata.com:6042
 
 一定要修改的参数是firstEp和fqdn。在每个数据节点，firstEp需全部配置成一样，**但fqdn一定要配置成其所在数据节点的值**。其他参数可不做任何修改，除非你很清楚为什么要修改。
 
-**加入到集群中的数据节点dnode，涉及集群相关的下表11项参数必须完全相同，否则不能成功加入到集群中。**
+**加入到集群中的数据节点dnode，涉及集群相关的下表9项参数必须完全相同，否则不能成功加入到集群中。**
 
 | **#** | **配置参数名称**   | **含义**                                 |
 | ----- | ------------------ | ---------------------------------------- |
@@ -68,6 +68,8 @@ arbitrator            ha.taosdata.com:6042
 
 ```
 Welcome to the TDengine shell from Linux, Client Version:2.0.0.0
+
+
 Copyright (c) 2017 by TAOS Data, Inc. All rights reserved.
 
 taos> show dnodes;

documentation20/en/00.index/docs.md

@@ -79,9 +79,10 @@ TDengine is a highly efficient platform to store, query, and analyze time-series
 - [Windows Client](https://www.taosdata.com/blog/2019/07/26/514.html): compile your own Windows client, which is required by various connectors on the Windows environment
 - [Rust Connector](/connector/rust): A taosc/RESTful API based TDengine client for Rust
 
-## [Components and Tools](/tools/adapter)
+## [Components and Tools](/cn/documentation/)
 
-* [taosAdapter](/tools/adapter)
+* [taosAdapter User Manual](/tools/adapter)
+* [TDinsight User Manual](/tools/insight)
 
 ## [Connections with Other Tools](/connections)
 

documentation20/en/08.connector/01.java/docs.md

@@ -310,46 +310,239 @@ The Java connector may report three types of error codes: JDBC Driver (error cod
 - https://github.com/taosdata/TDengine/blob/develop/src/inc/taoserror.h
 
 ### Write data through parameter binding
+Starting with version 2.1.2.0, TDengine's JDBC-JNI implementation significantly improves support for data write (INSERT) scenarios with Parameter-Binding. When writing data in this way, you can avoid the resource consumption of SQL parsing, which can significantly improve write performance in many cases.
+Note:
+* Jdbc-restful implementations do not provide Parameter-Binding
+* The following sample code is based on taos-jdbcdriver-2.0.36
+* use setString to bind BINARY data, and use setNString to bind NCHAR data
+* Both setString and setNString require the user to declare the column width of the corresponding column in the table definition in the size parameter
 
-Since version 2.1.2.0, TDengine's JDBC-JNI implementation has significantly improved parameter binding support for data write (INSERT) scenarios. Data can be written in the following way, avoiding SQL parsing and significantly improving the write performance.(**Note**: parameter binding is not supported in JDBC-RESTful)
 
+Sample Code:
 ```java
-Statement stmt = conn.createStatement();
-Random r = new Random();
+public class ParameterBindingDemo {
  
-// In the INSERT statement, the VALUES clause allows you to specify a specific column; If automatic table creation is adopted, the TAGS clause needs to set the parameter values of all TAGS columns
-TSDBPreparedStatement s = (TSDBPreparedStatement) conn.prepareStatement("insert into ? using weather_test tags (?, ?) (ts, c1, c2) values(?, ?, ?)");
+    private static final String host = "127.0.0.1";
+    private static final Random random = new Random(System.currentTimeMillis());
+    private static final int BINARY_COLUMN_SIZE = 20;
+    private static final String[] schemaList = {
+            "create table stable1(ts timestamp, f1 tinyint, f2 smallint, f3 int, f4 bigint) tags(t1 tinyint, t2 smallint, t3 int, t4 bigint)",
+            "create table stable2(ts timestamp, f1 float, f2 double) tags(t1 float, t2 double)",
+            "create table stable3(ts timestamp, f1 bool) tags(t1 bool)",
+            "create table stable4(ts timestamp, f1 binary(" + BINARY_COLUMN_SIZE + ")) tags(t1 binary(" + BINARY_COLUMN_SIZE + "))",
+            "create table stable5(ts timestamp, f1 nchar(" + BINARY_COLUMN_SIZE + ")) tags(t1 nchar(" + BINARY_COLUMN_SIZE + "))"
+    };
+    private static final int numOfSubTable = 10, numOfRow = 10;
  
-s.setTableName("w1");
+    public static void main(String[] args) throws SQLException {
  
-// set tags
-s.setTagInt(0, r.nextInt(10));
-s.setTagString(1, "Beijing");
-int numOfRows = 10;
+        String jdbcUrl = "jdbc:TAOS://" + host + ":6030/";
+        Connection conn = DriverManager.getConnection(jdbcUrl, "root", "taosdata");
  
-// set values
-ArrayList<Long> ts = new ArrayList<>();
-for (int i = 0; i < numOfRows; i++){
-    ts.add(System.currentTimeMillis() + i);
-}
-s.setTimestamp(0, ts);
-ArrayList<Integer> s1 = new ArrayList<>();
-for (int i = 0; i < numOfRows; i++){
-    s1.add(r.nextInt(100));
-}
-s.setInt(1, s1);
-ArrayList<String> s2 = new ArrayList<>();
-for (int i = 0; i < numOfRows; i++){
-    s2.add("test" + r.nextInt(100));
+        init(conn);
+ 
+        bindInteger(conn);
+ 
+        bindFloat(conn);
+ 
+        bindBoolean(conn);
+ 
+        bindBytes(conn);
+ 
+        bindString(conn);
+ 
+        conn.close();
+    }
+ 
+    private static void init(Connection conn) throws SQLException {
+        try (Statement stmt = conn.createStatement()) {
+            stmt.execute("drop database if exists test_parabind");
+            stmt.execute("create database if not exists test_parabind");
+            stmt.execute("use test_parabind");
+            for (int i = 0; i < schemaList.length; i++) {
+                stmt.execute(schemaList[i]);
+            }
+        }
+    }
+ 
+    private static void bindInteger(Connection conn) throws SQLException {
+        String sql = "insert into ? using stable1 tags(?,?,?,?) values(?,?,?,?,?)";
+ 
+        try (TSDBPreparedStatement pstmt = conn.prepareStatement(sql).unwrap(TSDBPreparedStatement.class)) {
+ 
+            for (int i = 1; i <= numOfSubTable; i++) {
+                // set table name
+                pstmt.setTableName("t1_" + i);
+                // set tags
+                pstmt.setTagByte(0, Byte.parseByte(Integer.toString(random.nextInt(Byte.MAX_VALUE))));
+                pstmt.setTagShort(1, Short.parseShort(Integer.toString(random.nextInt(Short.MAX_VALUE))));
+                pstmt.setTagInt(2, random.nextInt(Integer.MAX_VALUE));
+                pstmt.setTagLong(3, random.nextLong());
+                // set columns
+                ArrayList<Long> tsList = new ArrayList<>();
+                long current = System.currentTimeMillis();
+                for (int j = 0; j < numOfRow; j++)
+                    tsList.add(current + j);
+                pstmt.setTimestamp(0, tsList);
+ 
+                ArrayList<Byte> f1List = new ArrayList<>();
+                for (int j = 0; j < numOfRow; j++)
+                    f1List.add(Byte.parseByte(Integer.toString(random.nextInt(Byte.MAX_VALUE))));
+                pstmt.setByte(1, f1List);
+ 
+                ArrayList<Short> f2List = new ArrayList<>();
+                for (int j = 0; j < numOfRow; j++)
+                    f2List.add(Short.parseShort(Integer.toString(random.nextInt(Short.MAX_VALUE))));
+                pstmt.setShort(2, f2List);
+ 
+                ArrayList<Integer> f3List = new ArrayList<>();
+                for (int j = 0; j < numOfRow; j++)
+                    f3List.add(random.nextInt(Integer.MAX_VALUE));
+                pstmt.setInt(3, f3List);
+ 
+                ArrayList<Long> f4List = new ArrayList<>();
+                for (int j = 0; j < numOfRow; j++)
+                    f4List.add(random.nextLong());
+                pstmt.setLong(4, f4List);
+ 
+                // add column
+                pstmt.columnDataAddBatch();
+            }
+            // execute column
+            pstmt.columnDataExecuteBatch();
+        }
+    }
+ 
+    private static void bindFloat(Connection conn) throws SQLException {
+        String sql = "insert into ? using stable2 tags(?,?) values(?,?,?)";
+ 
+        TSDBPreparedStatement pstmt = conn.prepareStatement(sql).unwrap(TSDBPreparedStatement.class);
+ 
+        for (int i = 1; i <= numOfSubTable; i++) {
+            // set table name
+            pstmt.setTableName("t2_" + i);
+            // set tags
+            pstmt.setTagFloat(0, random.nextFloat());
+            pstmt.setTagDouble(1, random.nextDouble());
+            // set columns
+            ArrayList<Long> tsList = new ArrayList<>();
+            long current = System.currentTimeMillis();
+            for (int j = 0; j < numOfRow; j++)
+                tsList.add(current + j);
+            pstmt.setTimestamp(0, tsList);
+ 
+            ArrayList<Float> f1List = new ArrayList<>();
+            for (int j = 0; j < numOfRow; j++)
+                f1List.add(random.nextFloat());
+            pstmt.setFloat(1, f1List);
+ 
+            ArrayList<Double> f2List = new ArrayList<>();
+            for (int j = 0; j < numOfRow; j++)
+                f2List.add(random.nextDouble());
+            pstmt.setDouble(2, f2List);
+ 
+            // add column
+            pstmt.columnDataAddBatch();
+        }
+        // execute
+        pstmt.columnDataExecuteBatch();
+        // close if no try-with-catch statement is used
+        pstmt.close();
+    }
+ 
+    private static void bindBoolean(Connection conn) throws SQLException {
+        String sql = "insert into ? using stable3 tags(?) values(?,?)";
+ 
+        try (TSDBPreparedStatement pstmt = conn.prepareStatement(sql).unwrap(TSDBPreparedStatement.class)) {
+            for (int i = 1; i <= numOfSubTable; i++) {
+                // set table name
+                pstmt.setTableName("t3_" + i);
+                // set tags
+                pstmt.setTagBoolean(0, random.nextBoolean());
+                // set columns
+                ArrayList<Long> tsList = new ArrayList<>();
+                long current = System.currentTimeMillis();
+                for (int j = 0; j < numOfRow; j++)
+                    tsList.add(current + j);
+                pstmt.setTimestamp(0, tsList);
+ 
+                ArrayList<Boolean> f1List = new ArrayList<>();
+                for (int j = 0; j < numOfRow; j++)
+                    f1List.add(random.nextBoolean());
+                pstmt.setBoolean(1, f1List);
+ 
+                // add column
+                pstmt.columnDataAddBatch();
+            }
+            // execute
+            pstmt.columnDataExecuteBatch();
+        }
+    }
+ 
+    private static void bindBytes(Connection conn) throws SQLException {
+        String sql = "insert into ? using stable4 tags(?) values(?,?)";
+ 
+        try (TSDBPreparedStatement pstmt = conn.prepareStatement(sql).unwrap(TSDBPreparedStatement.class)) {
+ 
+            for (int i = 1; i <= numOfSubTable; i++) {
+                // set table name
+                pstmt.setTableName("t4_" + i);
+                // set tags
+                pstmt.setTagString(0, new String("abc"));
+ 
+                // set columns
+                ArrayList<Long> tsList = new ArrayList<>();
+                long current = System.currentTimeMillis();
+                for (int j = 0; j < numOfRow; j++)
+                    tsList.add(current + j);
+                pstmt.setTimestamp(0, tsList);
+ 
+                ArrayList<String> f1List = new ArrayList<>();
+                for (int j = 0; j < numOfRow; j++) {
+                    f1List.add(new String("abc"));
+                }
+                pstmt.setString(1, f1List, BINARY_COLUMN_SIZE);
+ 
+                // add column
+                pstmt.columnDataAddBatch();
+            }
+            // execute
+            pstmt.columnDataExecuteBatch();
+        }
+    }
+ 
+    private static void bindString(Connection conn) throws SQLException {
+        String sql = "insert into ? using stable5 tags(?) values(?,?)";
+ 
+        try (TSDBPreparedStatement pstmt = conn.prepareStatement(sql).unwrap(TSDBPreparedStatement.class)) {
+ 
+            for (int i = 1; i <= numOfSubTable; i++) {
+                // set table name
+                pstmt.setTableName("t5_" + i);
+                // set tags
+                pstmt.setTagNString(0, "北京-abc");
+ 
+                // set columns
+                ArrayList<Long> tsList = new ArrayList<>();
+                long current = System.currentTimeMillis();
+                for (int j = 0; j < numOfRow; j++)
+                    tsList.add(current + j);
+                pstmt.setTimestamp(0, tsList);
+ 
+                ArrayList<String> f1List = new ArrayList<>();
+                for (int j = 0; j < numOfRow; j++) {
+                    f1List.add("北京-abc");
+                }
+                pstmt.setNString(1, f1List, BINARY_COLUMN_SIZE);
+ 
+                // add column
+                pstmt.columnDataAddBatch();
+            }
+            // execute
+            pstmt.columnDataExecuteBatch();
+        }
+    }
 }
-s.setString(2, s2, 10);
-
-// The cache is not cleared after AddBatch. Do not bind new data again before ExecuteBatch
-s.columnDataAddBatch();
-s.columnDataExecuteBatch();
-// Clear the cache, after which you can bind new data(including table names, tags, values):
-s.columnDataClearBatch();
-s.columnDataCloseBatch();
 ```
 
 The methods used to set tags are:
@@ -382,10 +575,67 @@ public void setShort(int columnIndex, ArrayList<Short> list) throws SQLException
 public void setString(int columnIndex, ArrayList<String> list, int size) throws SQLException
 public void setNString(int columnIndex, ArrayList<String> list, int size) throws SQLException
 ```
+### Set client configuration in JDBC
+Starting with TDEngine-2.3.5.0, JDBC Driver supports setting TDengine client parameters on the first connection of a Java application. The Driver supports jdbcUrl and Properties to set client parameters in JDBC-JNI mode.
+
+Note:
+* JDBC-RESTful does not support setting client parameters.
+* The client parameters set in the java application are process-level. To update the client parameters, the application needs to be restarted. This is because these client parameters are global that take effect the first time the application is set up.
+* The following sample code is based on taos-jdbcdriver-2.0.36.
+
+Sample Code:
+```java
+public class ClientParameterSetting {
+    private static final String host = "127.0.0.1";
+ 
+    public static void main(String[] args) throws SQLException {
+        setParameterInJdbcUrl();
+ 
+        setParameterInProperties();
+    }
+ 
+    private static void setParameterInJdbcUrl() throws SQLException {
+        String jdbcUrl = "jdbc:TAOS://" + host + ":6030/?debugFlag=135&asyncLog=0";
+ 
+        Connection connection = DriverManager.getConnection(jdbcUrl, "root", "taosdata");
+ 
+        printDatabase(connection);
+ 
+        connection.close();
+    }
+ 
+    private static void setParameterInProperties() throws SQLException {
+        String jdbcUrl = "jdbc:TAOS://" + host + ":6030/";
+        Properties properties = new Properties();
+        properties.setProperty("user", "root");
+        properties.setProperty("password", "taosdata");
+        properties.setProperty("debugFlag", "135");
+        properties.setProperty("asyncLog", "0");
+        properties.setProperty("maxSQLLength", "1048576");
+ 
+        try (Connection conn = DriverManager.getConnection(jdbcUrl, properties)) {
+            printDatabase(conn);
+        }
+    }
+ 
+    private static void printDatabase(Connection connection) throws SQLException {
+        try (Statement stmt = connection.createStatement()) {
+            ResultSet rs = stmt.executeQuery("show databases");
+ 
+            ResultSetMetaData meta = rs.getMetaData();
+            while (rs.next()) {
+                for (int i = 1; i <= meta.getColumnCount(); i++) {
+                    System.out.print(meta.getColumnLabel(i) + ": " + rs.getString(i) + "\t");
+                }
+                System.out.println();
+            }
+        }
+    }
+}
+```
 
-**Note**: Both setString and setNString require the user to declare the column width of the corresponding column in the table definition in the size parameter.
 
-### Data Subscription
+## Data Subscription
 
 #### Subscribe
 

documentation20/en/08.connector/docs.md

@@ -411,38 +411,22 @@ See [video tutorials](https://www.taosdata.com/blog/2020/11/11/1963.html) for th
 
 ### Python connector installation
 
-#### Linux
+From TDengine 2.4, users can install python connector for TDengine with `pip`. Note that the package name is **taospy** (not `taos` - a fully unrelated package). For backward compatibility, we still use `import taos` to import connector package.
 
-Users can find the connector package for python2 and python3 in the source code src/connector/python (or tar.gz/connector/python) folder. Users can install it through `pip` command:
-
-`pip install src/connector/python/`
-
-or
-
- `pip3 install src/connector/python/`
-
-You can install the `taospy` connector from [PyPI](https://pypi.org/project/taospy/):
-
-```sh
+```bash
 pip install taospy
 ```
 
-#### Windows
-
-With Windows TDengine client installed, copy the file "C:\TDengine\driver\taos.dll" to the "C:\Windows\system32" directory and enter the Windows *cmd* command line interface:
+Use your version-specific `pip` command as if you need.
 
-```cmd
-cd C:\TDengine\connector\python
-python -m pip install .
+```bash
+pip2 install taospy
+pip3 install taospy
 ```
 
-Or install from PyPI:
-
-```cmd
-pip install taospy
-```
+The python connector requires `libtaos` library (`libtaos.so` in Linux, or `taos.dll` in Windows). For Windows client, if `import taos` failed, you could copy the dll `C:\TDengine\driver\taos.dll` to `C:\windows\system32` and try it again.
 
-- If there is no `pip` command on the machine, the user can copy the taos folder under src/connector/python to the application directory for use. For Windows client, after installing the TDengine Windows client, copy C:\ TDengine\driver\taos.dll to the C:\ windows\ system32 directory.
+For users that has a limited network environment, just add the `connector/python` of installed directory(commonly `/usr/local/taos/connector/python/` in Linux,  `C:\TDengine\connector\python` in Windows) to `PYTHONPATH` environment variable.
 
 ### How to use
 
@@ -462,63 +446,66 @@ for row in results:
     print(row)
 ```
 
-#### Code sample
+##### Code sample
 
 - Import the TDengine client module
 
-```python
-import taos
-```
+    ```python
+    import taos
+    ```
 
 - Get the connection and cursor object
 
-```python
-conn = taos.connect(host="127.0.0.1", user="root", password="taosdata", config="/etc/taos")
-c1 = conn.cursor()
-```
+    ```python
+    conn = taos.connect(host="127.0.0.1", user="root", password="taosdata", config="/etc/taos")
+    c1 = conn.cursor()
+    ```
+
+    *host* covers all IPs of TDengine server-side, and *config* is the directory where the client configuration files is located
 
-- *host* covers all IPs of TDengine server-side, and *config* is the directory where the client configuration files is located
 - Write data
 
-```python
-import datetime
-
-# Create a database
-c1.execute('create database db')
-c1.execute('use db')
-# Create a table
-c1.execute('create table tb (ts timestamp, temperature int, humidity float)')
-# Insert data
-start_time = datetime.datetime(2019, 11, 1)
-affected_rows = c1.execute('insert into tb values (\'%s\', 0, 0.0)' %start_time)
-# Insert data in batch
-time_interval = datetime.timedelta(seconds=60)
-sqlcmd = ['insert into tb values']
-for irow in range(1,11):
+    ```python
+    import datetime
+
+    # Create a database
+    c1.execute('create database db')
+    c1.execute('use db')
+    # Create a table
+    c1.execute('create table tb (ts timestamp, temperature int, humidity float)')
+    # Insert data
+    start_time = datetime.datetime(2019, 11, 1)
+    affected_rows = c1.execute('insert into tb values (\'%s\', 0, 0.0)' %start_time)
+    # Insert data in batch
+    time_interval = datetime.timedelta(seconds=60)
+    sqlcmd = ['insert into tb values']
+    for irow in range(1,11):
     start_time += time_interval
     sqlcmd.append('(\'%s\', %d, %f)' %(start_time, irow, irow*1.2))
-affected_rows = c1.execute(' '.join(sqlcmd))
-```
+    affected_rows = c1.execute(' '.join(sqlcmd))
+    ```
 
 - Query data
 
-```python
-c1.execute('select * from tb')
-# pull query result
-data = c1.fetchall()
-# The result is a list, with each row as an element
-numOfRows = c1.rowcount
-numOfCols = len(c1.description)
-for irow in range(numOfRows):
+    ```python
+    c1.execute('select * from tb')
+    # pull query result
+    data = c1.fetchall()
+    # The result is a list, with each row as an element
+    numOfRows = c1.rowcount
+    numOfCols = len(c1.description)
+    for irow in range(numOfRows):
     print("Row%d: ts=%s, temperature=%d, humidity=%f" %(irow, data[irow][0], data[irow][1],data[irow][2]))
 
-# Use cursor loop directly to pull query result
-c1.execute('select * from tb')
-for data in c1:
+    # Use cursor loop directly to pull query result
+    c1.execute('select * from tb')
+    for data in c1:
     print("ts=%s, temperature=%d, humidity=%f" %(data[0], data[1],data[2]))
-```
+    ```
 
-- Since v2.1.0, python connector provides a new API for query:
+#### Query API
+
+Since v2.1.0, python connector provides a new API for query:
 
 ```python
 import taos
@@ -556,15 +543,19 @@ Functions:
 - `errstr`: error string if failed.
 - `close`: close result, you do not need to call it directly, result will auto closed out of scope.
 
-- Create subscription
+#### Subscription API
+
+Create subscription
 
 ```python
 # Create a subscription with the topic ‘test’ and a consumption cycle of 1000 milliseconds
-# If the first parameter is True, it means restarting the subscription. If it is False and a subscription with the topic 'test 'has been created before, it means continuing to consume the data of this subscription instead of restarting to consume all the data
+# If the first parameter is True, it means restarting the subscription. 
+# If it is False and a subscription with the topic 'test 'has been created before,
+# it means continuing to consume the data of this subscription instead of restarting to consume all the data
 sub = conn.subscribe(True, "test", "select * from tb;", 1000)
 ```
 
-- Consume subscription data
+Consume subscription data.
 
 ```python
 data = sub.consume()
@@ -572,17 +563,15 @@ for d in data:
     print(d)
 ```
 
-- Unsubscription
+Unsubscribe.
 
 ```python
 sub.close()
 ```
 
-
-- Close connection
+Close connection.
 
 ```python
-c1.close()
 conn.close()
 ```
 

documentation20/en/09.connections/docs.md

@@ -15,7 +15,7 @@ https://grafana.com/grafana/download.
 Download grafana plugin from <https://github.com/taosdata/grafanaplugin/releases/latest> .
 
 ```bash
-GF_VERSION=3.1.1
+GF_VERSION=3.1.3
 wget https://github.com/taosdata/grafanaplugin/releases/download/v$GF_VERSION/tdengine-datasource-$GF_VERSION.zip
 ```
 
@@ -69,15 +69,7 @@ According to the default prompt, query the average system memory usage at the sp
 
 #### Import Dashboard
 
-We provide an example dashboard [Grafana Dashboard 15146](https://grafana.com/grafana/dashboards/15146)。
-
-Click the `Import` button on the left panel and load the grafana id:
-
-![img](../images/connections/import_dashboard1.jpg)
-
-You can see as follows after Dashboard imported.
-
-![img](../images/connections/dashboard-15146.png)
+We provide a TDinsight dashboard (via Grafana dashboard id: [15167](https://grafana.com/grafana/dashboards/15167)) for TDengine cluster monitoring since TDengine 2.3.3.x . Please refer to [TDinsight User Manual](https://www.taosdata.com/en/documentation/tools/insight) for the details.
 
 ## <a class="anchor" id="matlab"></a> MATLAB
 

packaging/check_package.sh

@@ -50,7 +50,7 @@ NC='\033[0m'
 
 csudo=""
 if command -v sudo > /dev/null; then
-    csudo="sudo"
+    csudo="sudo "
 fi
 
 # =============================  get input parameters =================================================
@@ -85,7 +85,7 @@ done
 function kill_process() {
   pid=$(ps -ef | grep "$1" | grep -v "grep" | awk '{print $2}')
   if [ -n "$pid" ]; then
-    ${csudo} kill -9 $pid   || :
+    ${csudo}kill -9 $pid   || :
   fi
 }
 

packaging/deb/DEBIAN/postinst

@@ -5,9 +5,9 @@ insmetaPath="/usr/local/taos/script"
 
 csudo=""
 if command -v sudo > /dev/null; then
-    csudo="sudo"
+    csudo="sudo "
 fi
 
-${csudo} chmod -R 744 ${insmetaPath}
+${csudo}chmod -R 744 ${insmetaPath}
 cd ${insmetaPath}
-${csudo} ./post.sh
+${csudo}./post.sh

packaging/deb/DEBIAN/preinst

@@ -2,19 +2,19 @@
 
 csudo=""
 if command -v sudo > /dev/null; then
-    csudo="sudo"
+    csudo="sudo "
 fi
 
 # Stop the service if running
 if pidof taosd &> /dev/null; then
     if pidof systemd &> /dev/null; then
-        ${csudo} systemctl stop taosd || :
+        ${csudo}systemctl stop taosd || :
     elif $(which service  &> /dev/null); then
-        ${csudo} service taosd stop || :
+        ${csudo}service taosd stop || :
     else
         pid=$(ps -ef | grep "taosd" | grep -v "grep" | awk '{print $2}')
         if [ -n "$pid" ]; then
-           ${csudo} kill -9 $pid   || :
+           ${csudo}kill -9 $pid   || :
         fi
     fi
     echo "Stop taosd service success!"
@@ -25,16 +25,16 @@ fi
 cfg_install_dir="/etc/taos"
 install_main_dir="/usr/local/taos"
 if [ -f "${install_main_dir}/taos.cfg" ]; then
-    ${csudo} rm -f ${install_main_dir}/cfg/taos.cfg   || :
+    ${csudo}rm -f ${install_main_dir}/cfg/taos.cfg   || :
 fi
 
 if [ -f "${install_main_dir}/taosadapter.toml" ]; then
-    ${csudo} rm -f ${install_main_dir}/cfg/taosadapter.toml     || :
+    ${csudo}rm -f ${install_main_dir}/cfg/taosadapter.toml     || :
 fi
 
 if [ -f "${install_main_dir}/taosadapter.service" ]; then
-    ${csudo} rm -f ${install_main_dir}/cfg/taosadapter.service || :
+    ${csudo}rm -f ${install_main_dir}/cfg/taosadapter.service || :
 fi
 
 # there can not libtaos.so*, otherwise ln -s  error
-${csudo} rm -f ${install_main_dir}/driver/libtaos*   || :
+${csudo}rm -f ${install_main_dir}/driver/libtaos*   || :

packaging/deb/DEBIAN/prerm

@@ -4,15 +4,15 @@ insmetaPath="/usr/local/taos/script"
 
 csudo=""
 if command -v sudo > /dev/null; then
-    csudo="sudo"
+    csudo="sudo "
 fi
 
-${csudo} chmod -R 744 ${insmetaPath}  || :
+${csudo}chmod -R 744 ${insmetaPath}  || :
 #cd ${insmetaPath}
-#${csudo} ./preun.sh
+#${csudo}./preun.sh
 if [ -f ${insmetaPath}/preun.sh ]; then
     cd ${insmetaPath}
-    ${csudo} ./preun.sh
+    ${csudo}./preun.sh
 else
     bin_link_dir="/usr/bin"
     lib_link_dir="/usr/lib"
@@ -23,20 +23,20 @@ else
     cfg_link_dir="/usr/local/taos/cfg"
 
     # Remove all links
-    ${csudo} rm -f ${bin_link_dir}/taos       || :
-    ${csudo} rm -f ${bin_link_dir}/taosd      || :
-    ${csudo} rm -f ${bin_link_dir}/taosadapter       || :
-    ${csudo} rm -f ${bin_link_dir}/taosdemo   || :
-    ${csudo} rm -f ${cfg_link_dir}/*          || :
-    ${csudo} rm -f ${inc_link_dir}/taos.h     || :
-    ${csudo} rm -f ${lib_link_dir}/libtaos.*  || :
+    ${csudo}rm -f ${bin_link_dir}/taos       || :
+    ${csudo}rm -f ${bin_link_dir}/taosd      || :
+    ${csudo}rm -f ${bin_link_dir}/taosadapter       || :
+    ${csudo}rm -f ${bin_link_dir}/taosdemo   || :
+    ${csudo}rm -f ${cfg_link_dir}/*          || :
+    ${csudo}rm -f ${inc_link_dir}/taos.h     || :
+    ${csudo}rm -f ${lib_link_dir}/libtaos.*  || :
 
-    ${csudo} rm -f ${log_link_dir}            || :
-    ${csudo} rm -f ${data_link_dir}           || :
+    ${csudo}rm -f ${log_link_dir}            || :
+    ${csudo}rm -f ${data_link_dir}           || :
 
     pid=$(ps -ef | grep "taosd" | grep -v "grep" | awk '{print $2}')
     if [ -n "$pid" ]; then
-        ${csudo} kill -9 $pid   || :
+        ${csudo}kill -9 $pid   || :
     fi
 fi
 

packaging/release.sh

@@ -113,7 +113,7 @@ fi
 
 csudo=""
 #if command -v sudo > /dev/null; then
-#  csudo="sudo"
+#  csudo="sudo "
 #fi
 
 function is_valid_version() {
@@ -183,11 +183,11 @@ cd ${curr_dir}
 # 2. cmake executable file
 compile_dir="${top_dir}/debug"
 if [ -d ${compile_dir} ]; then
-  ${csudo} rm -rf ${compile_dir}
+  ${csudo}rm -rf ${compile_dir}
 fi
 
 if [ "$osType" != "Darwin" ]; then
-  ${csudo} mkdir -p ${compile_dir}
+  ${csudo}mkdir -p ${compile_dir}
 else
   mkdir -p ${compile_dir}
 fi
@@ -496,9 +496,9 @@ fi
 
 if [[ "$allocator" == "jemalloc" ]]; then
     # jemalloc need compile first, so disable parallel build
-    make -j 8 && ${csudo} make install
+    make -j 8 && ${csudo}make install
 else
-    make -j 8 && ${csudo} make install
+    make -j 8 && ${csudo}make install
 fi
 
 cd ${curr_dir}
@@ -512,11 +512,11 @@ if [ "$osType" != "Darwin" ]; then
       echo "====do deb package for the ubuntu system===="
       output_dir="${top_dir}/debs"
       if [ -d ${output_dir} ]; then
-        ${csudo} rm -rf ${output_dir}
+        ${csudo}rm -rf ${output_dir}
       fi
-      ${csudo} mkdir -p ${output_dir}
+      ${csudo}mkdir -p ${output_dir}
       cd ${script_dir}/deb
-      ${csudo} ./makedeb.sh ${compile_dir} ${output_dir} ${verNumber} ${cpuType} ${osType} ${verMode} ${verType}
+      ${csudo}./makedeb.sh ${compile_dir} ${output_dir} ${verNumber} ${cpuType} ${osType} ${verMode} ${verType}
 
       if [[ "$pagMode" == "full" ]]; then
           if [ -d ${top_dir}/src/kit/taos-tools/packaging/deb ]; then
@@ -524,7 +524,7 @@ if [ "$osType" != "Darwin" ]; then
               [ -z "$taos_tools_ver" ] && taos_tools_ver="0.1.0"
 
               taos_tools_ver=$(git describe --tags|sed -e 's/ver-//g'|awk -F '-' '{print $1}')
-              ${csudo} ./make-taos-tools-deb.sh ${top_dir} \
+              ${csudo}./make-taos-tools-deb.sh ${top_dir} \
                   ${compile_dir} ${output_dir} ${taos_tools_ver} ${cpuType} ${osType} ${verMode} ${verType}
           fi
       fi
@@ -537,11 +537,11 @@ if [ "$osType" != "Darwin" ]; then
       echo "====do rpm package for the centos system===="
       output_dir="${top_dir}/rpms"
       if [ -d ${output_dir} ]; then
-        ${csudo} rm -rf ${output_dir}
+        ${csudo}rm -rf ${output_dir}
       fi
-      ${csudo} mkdir -p ${output_dir}
+      ${csudo}mkdir -p ${output_dir}
       cd ${script_dir}/rpm
-      ${csudo} ./makerpm.sh ${compile_dir} ${output_dir} ${verNumber} ${cpuType} ${osType} ${verMode} ${verType}
+      ${csudo}./makerpm.sh ${compile_dir} ${output_dir} ${verNumber} ${cpuType} ${osType} ${verMode} ${verType}
 
       if [[ "$pagMode" == "full" ]]; then
           if [ -d ${top_dir}/src/kit/taos-tools/packaging/rpm ]; then
@@ -549,7 +549,7 @@ if [ "$osType" != "Darwin" ]; then
               [ -z "$taos_tools_ver" ] && taos_tools_ver="0.1.0"
 
               taos_tools_ver=$(git describe --tags|sed -e 's/ver-//g'|awk -F '-' '{print $1}'|sed -e 's/-/_/g')
-              ${csudo} ./make-taos-tools-rpm.sh ${top_dir} \
+              ${csudo}./make-taos-tools-rpm.sh ${top_dir} \
                   ${compile_dir} ${output_dir} ${taos_tools_ver} ${cpuType} ${osType} ${verMode} ${verType}
           fi
       fi
@@ -562,29 +562,29 @@ if [ "$osType" != "Darwin" ]; then
   cd ${script_dir}/tools
 
   if [[ "$dbName" == "taos" ]]; then
-    ${csudo} ./makepkg.sh    ${compile_dir} ${verNumber} "${build_time}" ${cpuType} ${osType} ${verMode} ${verType} ${pagMode} ${verNumberComp}
-    ${csudo} ./makeclient.sh ${compile_dir} ${verNumber} "${build_time}" ${cpuType} ${osType} ${verMode} ${verType} ${pagMode}
-    ${csudo} ./makearbi.sh   ${compile_dir} ${verNumber} "${build_time}" ${cpuType} ${osType} ${verMode} ${verType} ${pagMode}
+    ${csudo}./makepkg.sh    ${compile_dir} ${verNumber} "${build_time}" ${cpuType} ${osType} ${verMode} ${verType} ${pagMode} ${verNumberComp}
+    ${csudo}./makeclient.sh ${compile_dir} ${verNumber} "${build_time}" ${cpuType} ${osType} ${verMode} ${verType} ${pagMode}
+    ${csudo}./makearbi.sh   ${compile_dir} ${verNumber} "${build_time}" ${cpuType} ${osType} ${verMode} ${verType} ${pagMode}
   elif [[ "$dbName" == "tq" ]]; then
-    ${csudo} ./makepkg_tq.sh    ${compile_dir} ${verNumber} "${build_time}" ${cpuType} ${osType} ${verMode} ${verType} ${pagMode} ${dbName} ${verNumberComp}
-    ${csudo} ./makeclient_tq.sh ${compile_dir} ${verNumber} "${build_time}" ${cpuType} ${osType} ${verMode} ${verType} ${pagMode} ${dbName}
-    ${csudo} ./makearbi_tq.sh   ${compile_dir} ${verNumber} "${build_time}" ${cpuType} ${osType} ${verMode} ${verType} ${pagMode}
+    ${csudo}./makepkg_tq.sh    ${compile_dir} ${verNumber} "${build_time}" ${cpuType} ${osType} ${verMode} ${verType} ${pagMode} ${dbName} ${verNumberComp}
+    ${csudo}./makeclient_tq.sh ${compile_dir} ${verNumber} "${build_time}" ${cpuType} ${osType} ${verMode} ${verType} ${pagMode} ${dbName}
+    ${csudo}./makearbi_tq.sh   ${compile_dir} ${verNumber} "${build_time}" ${cpuType} ${osType} ${verMode} ${verType} ${pagMode}
   elif [[ "$dbName" == "pro" ]]; then
-    ${csudo} ./makepkg_pro.sh    ${compile_dir} ${verNumber} "${build_time}" ${cpuType} ${osType} ${verMode} ${verType} ${pagMode} ${dbName} ${verNumberComp}
-    ${csudo} ./makeclient_pro.sh ${compile_dir} ${verNumber} "${build_time}" ${cpuType} ${osType} ${verMode} ${verType} ${pagMode} ${dbName}
-    ${csudo} ./makearbi_pro.sh   ${compile_dir} ${verNumber} "${build_time}" ${cpuType} ${osType} ${verMode} ${verType} ${pagMode}
+    ${csudo}./makepkg_pro.sh    ${compile_dir} ${verNumber} "${build_time}" ${cpuType} ${osType} ${verMode} ${verType} ${pagMode} ${dbName} ${verNumberComp}
+    ${csudo}./makeclient_pro.sh ${compile_dir} ${verNumber} "${build_time}" ${cpuType} ${osType} ${verMode} ${verType} ${pagMode} ${dbName}
+    ${csudo}./makearbi_pro.sh   ${compile_dir} ${verNumber} "${build_time}" ${cpuType} ${osType} ${verMode} ${verType} ${pagMode}
   elif [[ "$dbName" == "kh" ]]; then
-    ${csudo} ./makepkg_kh.sh    ${compile_dir} ${verNumber} "${build_time}" ${cpuType} ${osType} ${verMode} ${verType} ${pagMode} ${dbName} ${verNumberComp}
-    ${csudo} ./makeclient_kh.sh ${compile_dir} ${verNumber} "${build_time}" ${cpuType} ${osType} ${verMode} ${verType} ${pagMode} ${dbName}
-    ${csudo} ./makearbi_kh.sh   ${compile_dir} ${verNumber} "${build_time}" ${cpuType} ${osType} ${verMode} ${verType} ${pagMode}
+    ${csudo}./makepkg_kh.sh    ${compile_dir} ${verNumber} "${build_time}" ${cpuType} ${osType} ${verMode} ${verType} ${pagMode} ${dbName} ${verNumberComp}
+    ${csudo}./makeclient_kh.sh ${compile_dir} ${verNumber} "${build_time}" ${cpuType} ${osType} ${verMode} ${verType} ${pagMode} ${dbName}
+    ${csudo}./makearbi_kh.sh   ${compile_dir} ${verNumber} "${build_time}" ${cpuType} ${osType} ${verMode} ${verType} ${pagMode}
   elif [[ "$dbName" == "jh" ]]; then
-    ${csudo} ./makepkg_jh.sh    ${compile_dir} ${verNumber} "${build_time}" ${cpuType} ${osType} ${verMode} ${verType} ${pagMode} ${dbName} ${verNumberComp}
-    ${csudo} ./makeclient_jh.sh ${compile_dir} ${verNumber} "${build_time}" ${cpuType} ${osType} ${verMode} ${verType} ${pagMode} ${dbName}
-    ${csudo} ./makearbi_jh.sh   ${compile_dir} ${verNumber} "${build_time}" ${cpuType} ${osType} ${verMode} ${verType} ${pagMode}
+    ${csudo}./makepkg_jh.sh    ${compile_dir} ${verNumber} "${build_time}" ${cpuType} ${osType} ${verMode} ${verType} ${pagMode} ${dbName} ${verNumberComp}
+    ${csudo}./makeclient_jh.sh ${compile_dir} ${verNumber} "${build_time}" ${cpuType} ${osType} ${verMode} ${verType} ${pagMode} ${dbName}
+    ${csudo}./makearbi_jh.sh   ${compile_dir} ${verNumber} "${build_time}" ${cpuType} ${osType} ${verMode} ${verType} ${pagMode}
   else
-    ${csudo} ./makepkg_power.sh    ${compile_dir} ${verNumber} "${build_time}" ${cpuType} ${osType} ${verMode} ${verType} ${pagMode} ${dbName} ${verNumberComp}
-    ${csudo} ./makeclient_power.sh ${compile_dir} ${verNumber} "${build_time}" ${cpuType} ${osType} ${verMode} ${verType} ${pagMode} ${dbName}
-    ${csudo} ./makearbi_power.sh   ${compile_dir} ${verNumber} "${build_time}" ${cpuType} ${osType} ${verMode} ${verType} ${pagMode}
+    ${csudo}./makepkg_power.sh    ${compile_dir} ${verNumber} "${build_time}" ${cpuType} ${osType} ${verMode} ${verType} ${pagMode} ${dbName} ${verNumberComp}
+    ${csudo}./makeclient_power.sh ${compile_dir} ${verNumber} "${build_time}" ${cpuType} ${osType} ${verMode} ${verType} ${pagMode} ${dbName}
+    ${csudo}./makearbi_power.sh   ${compile_dir} ${verNumber} "${build_time}" ${cpuType} ${osType} ${verMode} ${verType} ${pagMode}
   fi
 else
   # only make client for Darwin

packaging/rpm/makerpm.sh

@@ -28,7 +28,7 @@ echo "spec_file: ${spec_file}"
 
 csudo=""
 if command -v sudo > /dev/null; then
-    csudo="sudo"
+    csudo="sudo "
 fi
 
 function cp_rpm_package() {
@@ -49,17 +49,17 @@ function cp_rpm_package() {
 }
 
 if [ -d ${pkg_dir} ]; then
-  ${csudo} rm -rf ${pkg_dir}
+  ${csudo}rm -rf ${pkg_dir}
 fi
-${csudo} mkdir -p ${pkg_dir}
+${csudo}mkdir -p ${pkg_dir}
 cd ${pkg_dir}
 
-${csudo} mkdir -p BUILD BUILDROOT RPMS SOURCES SPECS SRPMS
+${csudo}mkdir -p BUILD BUILDROOT RPMS SOURCES SPECS SRPMS
 
-${csudo} rpmbuild --define="_version ${tdengine_ver}" --define="_topdir ${pkg_dir}" --define="_compiledir ${compile_dir}" -bb ${spec_file}
+${csudo}rpmbuild --define="_version ${tdengine_ver}" --define="_topdir ${pkg_dir}" --define="_compiledir ${compile_dir}" -bb ${spec_file}
 
 # copy rpm package to output_dir, and modify package name, then clean temp dir
-#${csudo} cp -rf RPMS/* ${output_dir}
+#${csudo}cp -rf RPMS/* ${output_dir}
 cp_rpm_package ${pkg_dir}/RPMS
 
 
@@ -84,4 +84,4 @@ fi
 mv ${output_dir}/TDengine-${tdengine_ver}.rpm ${output_dir}/${rpmname}
 
 cd ..
-${csudo} rm -rf ${pkg_dir}
+${csudo}rm -rf ${pkg_dir}

packaging/rpm/tdengine.spec

@@ -128,19 +128,19 @@ fi
 %pre
 csudo=""
 if command -v sudo > /dev/null; then
-    csudo="sudo"
+    csudo="sudo "
 fi
 
 # Stop the service if running
 if pidof taosd &> /dev/null; then
     if pidof systemd &> /dev/null; then
-        ${csudo} systemctl stop taosd || :
+        ${csudo}systemctl stop taosd || :
     elif $(which service  &> /dev/null); then
-        ${csudo} service taosd stop || :
+        ${csudo}service taosd stop || :
     else
         pid=$(ps -ef | grep "taosd" | grep -v "grep" | awk '{print $2}')
         if [ -n "$pid" ]; then
-           ${csudo} kill -9 $pid   || :
+           ${csudo}kill -9 $pid   || :
         fi
     fi
     echo "Stop taosd service success!"
@@ -148,40 +148,40 @@ if pidof taosd &> /dev/null; then
 fi
 # if taos.cfg already exist, remove it
 if [ -f %{cfg_install_dir}/taos.cfg ]; then
-    ${csudo} rm -f %{cfg_install_dir}/cfg/taos.cfg   || :
+    ${csudo}rm -f %{cfg_install_dir}/cfg/taos.cfg   || :
 fi
 
 # if taosadapter.toml already exist, remove it
 if [ -f %{cfg_install_dir}/taosadapter.toml ]; then
-    ${csudo} rm -f %{cfg_install_dir}/cfg/taosadapter.toml || :
+    ${csudo}rm -f %{cfg_install_dir}/cfg/taosadapter.toml || :
 fi
 
 # there can not libtaos.so*, otherwise ln -s  error
-${csudo} rm -f %{homepath}/driver/libtaos*   || :
+${csudo}rm -f %{homepath}/driver/libtaos*   || :
 
 #Scripts executed after installation
 %post
 csudo=""
 if command -v sudo > /dev/null; then
-    csudo="sudo"
+    csudo="sudo "
 fi
 cd %{homepath}/script
-${csudo} ./post.sh
+${csudo}./post.sh
 
 # Scripts executed before uninstall
 %preun
 csudo=""
 if command -v sudo > /dev/null; then
-    csudo="sudo"
+    csudo="sudo "
 fi
 # only remove package to call preun.sh, not but update(2)
 if [ $1 -eq 0 ];then
   #cd %{homepath}/script
-  #${csudo} ./preun.sh
+  #${csudo}./preun.sh
 
   if [ -f %{homepath}/script/preun.sh ]; then
     cd %{homepath}/script
-    ${csudo} ./preun.sh
+    ${csudo}./preun.sh
   else
     bin_link_dir="/usr/bin"
     lib_link_dir="/usr/lib"
@@ -192,21 +192,21 @@ if [ $1 -eq 0 ];then
     cfg_link_dir="/usr/local/taos/cfg"
 
     # Remove all links
-    ${csudo} rm -f ${bin_link_dir}/taos       || :
-    ${csudo} rm -f ${bin_link_dir}/taosd      || :
-    ${csudo} rm -f ${bin_link_dir}/taosadapter       || :
-    ${csudo} rm -f ${cfg_link_dir}/*          || :
-    ${csudo} rm -f ${inc_link_dir}/taos.h     || :
-    ${csudo} rm -f ${inc_link_dir}/taosdef.h     || :
-    ${csudo} rm -f ${inc_link_dir}/taoserror.h     || :
-    ${csudo} rm -f ${lib_link_dir}/libtaos.*  || :
-
-    ${csudo} rm -f ${log_link_dir}            || :
-    ${csudo} rm -f ${data_link_dir}           || :
+    ${csudo}rm -f ${bin_link_dir}/taos       || :
+    ${csudo}rm -f ${bin_link_dir}/taosd      || :
+    ${csudo}rm -f ${bin_link_dir}/taosadapter       || :
+    ${csudo}rm -f ${cfg_link_dir}/*          || :
+    ${csudo}rm -f ${inc_link_dir}/taos.h     || :
+    ${csudo}rm -f ${inc_link_dir}/taosdef.h     || :
+    ${csudo}rm -f ${inc_link_dir}/taoserror.h     || :
+    ${csudo}rm -f ${lib_link_dir}/libtaos.*  || :
+
+    ${csudo}rm -f ${log_link_dir}            || :
+    ${csudo}rm -f ${data_link_dir}           || :
 
     pid=$(ps -ef | grep "taosd" | grep -v "grep" | awk '{print $2}')
     if [ -n "$pid" ]; then
-      ${csudo} kill -9 $pid   || :
+      ${csudo}kill -9 $pid   || :
     fi
   fi
 fi
@@ -218,9 +218,9 @@ fi
 %clean
 csudo=""
 if command -v sudo > /dev/null; then
-    csudo="sudo"
+    csudo="sudo "
 fi
-${csudo} rm -rf %{buildroot}
+${csudo}rm -rf %{buildroot}
 
 #Specify the files to be packaged
 %files

packaging/tools/install_arbi.sh

@@ -29,7 +29,7 @@ NC='\033[0m'
 
 csudo=""
 if command -v sudo > /dev/null; then
-    csudo="sudo"
+    csudo="sudo "
 fi
 
 update_flag=0
@@ -91,85 +91,85 @@ fi
 function kill_tarbitrator() {
   pid=$(ps -ef | grep "tarbitrator" | grep -v "grep" | awk '{print $2}')
   if [ -n "$pid" ]; then
-    ${csudo} kill -9 $pid   || :
+    ${csudo}kill -9 $pid   || :
   fi
 }
 
 function install_main_path() {
     #create install main dir and all sub dir
-    ${csudo} rm -rf ${install_main_dir}    || :
-    ${csudo} mkdir -p ${install_main_dir}
-    ${csudo} mkdir -p ${install_main_dir}/bin
-    #${csudo} mkdir -p ${install_main_dir}/include
-    ${csudo} mkdir -p ${install_main_dir}/init.d
+    ${csudo}rm -rf ${install_main_dir}    || :
+    ${csudo}mkdir -p ${install_main_dir}
+    ${csudo}mkdir -p ${install_main_dir}/bin
+    #${csudo}mkdir -p ${install_main_dir}/include
+    ${csudo}mkdir -p ${install_main_dir}/init.d
 }
 
 function install_bin() {
     # Remove links
-    ${csudo} rm -f ${bin_link_dir}/rmtarbitrator   || :
-    ${csudo} rm -f ${bin_link_dir}/tarbitrator     || :
-    ${csudo} cp -r ${script_dir}/bin/* ${install_main_dir}/bin && ${csudo} chmod 0555 ${install_main_dir}/bin/*
+    ${csudo}rm -f ${bin_link_dir}/rmtarbitrator   || :
+    ${csudo}rm -f ${bin_link_dir}/tarbitrator     || :
+    ${csudo}cp -r ${script_dir}/bin/* ${install_main_dir}/bin && ${csudo}chmod 0555 ${install_main_dir}/bin/*
 
     #Make link
-    [ -x ${install_main_dir}/bin/remove_arbi.sh ] && ${csudo} ln -s ${install_main_dir}/bin/remove_arbi.sh ${bin_link_dir}/rmtarbitrator  || :
-    [ -x ${install_main_dir}/bin/tarbitrator ] && ${csudo} ln -s ${install_main_dir}/bin/tarbitrator ${bin_link_dir}/tarbitrator || :
+    [ -x ${install_main_dir}/bin/remove_arbi.sh ] && ${csudo}ln -s ${install_main_dir}/bin/remove_arbi.sh ${bin_link_dir}/rmtarbitrator  || :
+    [ -x ${install_main_dir}/bin/tarbitrator ] && ${csudo}ln -s ${install_main_dir}/bin/tarbitrator ${bin_link_dir}/tarbitrator || :
 }
 
 function install_header() {
-    ${csudo} rm -f ${inc_link_dir}/taos.h ${inc_link_dir}/taosdef.h ${inc_link_dir}/taoserror.h    || :
-    ${csudo} cp -f ${script_dir}/inc/* ${install_main_dir}/include && ${csudo} chmod 644 ${install_main_dir}/include/*
-    ${csudo} ln -s ${install_main_dir}/include/taos.h ${inc_link_dir}/taos.h
-    ${csudo} ln -s ${install_main_dir}/include/taosdef.h ${inc_link_dir}/taosdef.h
-    ${csudo} ln -s ${install_main_dir}/include/taoserror.h ${inc_link_dir}/taoserror.h
+    ${csudo}rm -f ${inc_link_dir}/taos.h ${inc_link_dir}/taosdef.h ${inc_link_dir}/taoserror.h    || :
+    ${csudo}cp -f ${script_dir}/inc/* ${install_main_dir}/include && ${csudo}chmod 644 ${install_main_dir}/include/*
+    ${csudo}ln -s ${install_main_dir}/include/taos.h ${inc_link_dir}/taos.h
+    ${csudo}ln -s ${install_main_dir}/include/taosdef.h ${inc_link_dir}/taosdef.h
+    ${csudo}ln -s ${install_main_dir}/include/taoserror.h ${inc_link_dir}/taoserror.h
 }
 
 function install_jemalloc() {
     jemalloc_dir=${script_dir}/jemalloc
 
     if [ -d ${jemalloc_dir} ]; then
-        ${csudo} /usr/bin/install -c -d /usr/local/bin
+        ${csudo}/usr/bin/install -c -d /usr/local/bin
 
         if [ -f ${jemalloc_dir}/bin/jemalloc-config ]; then
-            ${csudo} /usr/bin/install -c -m 755 ${jemalloc_dir}/bin/jemalloc-config /usr/local/bin
+            ${csudo}/usr/bin/install -c -m 755 ${jemalloc_dir}/bin/jemalloc-config /usr/local/bin
         fi
         if [ -f ${jemalloc_dir}/bin/jemalloc.sh ]; then
-            ${csudo} /usr/bin/install -c -m 755 ${jemalloc_dir}/bin/jemalloc.sh /usr/local/bin
+            ${csudo}/usr/bin/install -c -m 755 ${jemalloc_dir}/bin/jemalloc.sh /usr/local/bin
         fi
         if [ -f ${jemalloc_dir}/bin/jeprof ]; then
-            ${csudo} /usr/bin/install -c -m 755 ${jemalloc_dir}/bin/jeprof /usr/local/bin
+            ${csudo}/usr/bin/install -c -m 755 ${jemalloc_dir}/bin/jeprof /usr/local/bin
         fi
         if [ -f ${jemalloc_dir}/include/jemalloc/jemalloc.h ]; then
-            ${csudo} /usr/bin/install -c -d /usr/local/include/jemalloc
-            ${csudo} /usr/bin/install -c -m 644 ${jemalloc_dir}/include/jemalloc/jemalloc.h /usr/local/include/jemalloc
+            ${csudo}/usr/bin/install -c -d /usr/local/include/jemalloc
+            ${csudo}/usr/bin/install -c -m 644 ${jemalloc_dir}/include/jemalloc/jemalloc.h /usr/local/include/jemalloc
         fi
         if [ -f ${jemalloc_dir}/lib/libjemalloc.so.2 ]; then
-            ${csudo} /usr/bin/install -c -d /usr/local/lib
-            ${csudo} /usr/bin/install -c -m 755 ${jemalloc_dir}/lib/libjemalloc.so.2 /usr/local/lib
-            ${csudo} ln -sf libjemalloc.so.2 /usr/local/lib/libjemalloc.so
-            ${csudo} /usr/bin/install -c -d /usr/local/lib
+            ${csudo}/usr/bin/install -c -d /usr/local/lib
+            ${csudo}/usr/bin/install -c -m 755 ${jemalloc_dir}/lib/libjemalloc.so.2 /usr/local/lib
+            ${csudo}ln -sf libjemalloc.so.2 /usr/local/lib/libjemalloc.so
+            ${csudo}/usr/bin/install -c -d /usr/local/lib
             if [ -f ${jemalloc_dir}/lib/libjemalloc.a ]; then
-                ${csudo} /usr/bin/install -c -m 755 ${jemalloc_dir}/lib/libjemalloc.a /usr/local/lib
+                ${csudo}/usr/bin/install -c -m 755 ${jemalloc_dir}/lib/libjemalloc.a /usr/local/lib
             fi
             if [ -f ${jemalloc_dir}/lib/libjemalloc_pic.a ]; then
-                ${csudo} /usr/bin/install -c -m 755 ${jemalloc_dir}/lib/libjemalloc_pic.a /usr/local/lib
+                ${csudo}/usr/bin/install -c -m 755 ${jemalloc_dir}/lib/libjemalloc_pic.a /usr/local/lib
             fi
             if [ -f ${jemalloc_dir}/lib/libjemalloc_pic.a ]; then
-                ${csudo} /usr/bin/install -c -d /usr/local/lib/pkgconfig
-                ${csudo} /usr/bin/install -c -m 644 ${jemalloc_dir}/lib/pkgconfig/jemalloc.pc /usr/local/lib/pkgconfig
+                ${csudo}/usr/bin/install -c -d /usr/local/lib/pkgconfig
+                ${csudo}/usr/bin/install -c -m 644 ${jemalloc_dir}/lib/pkgconfig/jemalloc.pc /usr/local/lib/pkgconfig
             fi
         fi
         if [ -f ${jemalloc_dir}/share/doc/jemalloc/jemalloc.html ]; then
-            ${csudo} /usr/bin/install -c -d /usr/local/share/doc/jemalloc
-            ${csudo} /usr/bin/install -c -m 644 ${jemalloc_dir}/share/doc/jemalloc/jemalloc.html /usr/local/share/doc/jemalloc
+            ${csudo}/usr/bin/install -c -d /usr/local/share/doc/jemalloc
+            ${csudo}/usr/bin/install -c -m 644 ${jemalloc_dir}/share/doc/jemalloc/jemalloc.html /usr/local/share/doc/jemalloc
         fi
         if [ -f ${jemalloc_dir}/share/man/man3/jemalloc.3 ]; then
-            ${csudo} /usr/bin/install -c -d /usr/local/share/man/man3
-            ${csudo} /usr/bin/install -c -m 644 ${jemalloc_dir}/share/man/man3/jemalloc.3 /usr/local/share/man/man3
+            ${csudo}/usr/bin/install -c -d /usr/local/share/man/man3
+            ${csudo}/usr/bin/install -c -m 644 ${jemalloc_dir}/share/man/man3/jemalloc.3 /usr/local/share/man/man3
         fi
 
         if [ -d /etc/ld.so.conf.d ]; then
-            echo "/usr/local/lib" | ${csudo} tee /etc/ld.so.conf.d/jemalloc.conf > /dev/null || echo -e "failed to write /etc/ld.so.conf.d/jemalloc.conf"
-            ${csudo} ldconfig
+            echo "/usr/local/lib" | ${csudo}tee /etc/ld.so.conf.d/jemalloc.conf > /dev/null || echo -e "failed to write /etc/ld.so.conf.d/jemalloc.conf"
+            ${csudo}ldconfig
         else
             echo "/etc/ld.so.conf.d not found!"
         fi
@@ -178,30 +178,30 @@ function install_jemalloc() {
 
 function clean_service_on_sysvinit() {
     #restart_config_str="taos:2345:respawn:${service_config_dir}/taosd start"
-    #${csudo} sed -i "\|${restart_config_str}|d" /etc/inittab || :
+    #${csudo}sed -i "\|${restart_config_str}|d" /etc/inittab || :
 
     if pidof tarbitrator &> /dev/null; then
-        ${csudo} service tarbitratord stop || :
+        ${csudo}service tarbitratord stop || :
     fi
 
     if ((${initd_mod}==1)); then
       if [ -e ${service_config_dir}/tarbitratord ]; then
-        ${csudo} chkconfig --del tarbitratord || :
+        ${csudo}chkconfig --del tarbitratord || :
       fi
     elif ((${initd_mod}==2)); then
       if [ -e ${service_config_dir}/tarbitratord ]; then
-        ${csudo} insserv -r tarbitratord || :
+        ${csudo}insserv -r tarbitratord || :
       fi
     elif ((${initd_mod}==3)); then
       if [ -e ${service_config_dir}/tarbitratord ]; then
-        ${csudo} update-rc.d -f tarbitratord remove || :
+        ${csudo}update-rc.d -f tarbitratord remove || :
       fi
     fi
 
-    ${csudo} rm -f ${service_config_dir}/tarbitratord || :
+    ${csudo}rm -f ${service_config_dir}/tarbitratord || :
 
     if $(which init &> /dev/null); then
-        ${csudo} init q || :
+        ${csudo}init q || :
     fi
 }
 
@@ -212,24 +212,24 @@ function install_service_on_sysvinit() {
     # Install taosd service
 
     if ((${os_type}==1)); then
-        ${csudo} cp -f ${script_dir}/init.d/tarbitratord.deb ${install_main_dir}/init.d/tarbitratord
-        ${csudo} cp    ${script_dir}/init.d/tarbitratord.deb ${service_config_dir}/tarbitratord && ${csudo} chmod a+x ${service_config_dir}/tarbitratord
+        ${csudo}cp -f ${script_dir}/init.d/tarbitratord.deb ${install_main_dir}/init.d/tarbitratord
+        ${csudo}cp    ${script_dir}/init.d/tarbitratord.deb ${service_config_dir}/tarbitratord && ${csudo}chmod a+x ${service_config_dir}/tarbitratord
     elif ((${os_type}==2)); then
-        ${csudo} cp -f ${script_dir}/init.d/tarbitratord.rpm ${install_main_dir}/init.d/tarbitratord
-        ${csudo} cp    ${script_dir}/init.d/tarbitratord.rpm ${service_config_dir}/tarbitratord && ${csudo} chmod a+x ${service_config_dir}/tarbitratord
+        ${csudo}cp -f ${script_dir}/init.d/tarbitratord.rpm ${install_main_dir}/init.d/tarbitratord
+        ${csudo}cp    ${script_dir}/init.d/tarbitratord.rpm ${service_config_dir}/tarbitratord && ${csudo}chmod a+x ${service_config_dir}/tarbitratord
     fi
 
     #restart_config_str="taos:2345:respawn:${service_config_dir}/taosd start"
-    #${csudo} grep -q -F "$restart_config_str" /etc/inittab || ${csudo} bash -c "echo '${restart_config_str}' >> /etc/inittab"
+    #${csudo}grep -q -F "$restart_config_str" /etc/inittab || ${csudo}bash -c "echo '${restart_config_str}' >> /etc/inittab"
 
     if ((${initd_mod}==1)); then
-        ${csudo} chkconfig --add tarbitratord || :
-        ${csudo} chkconfig --level 2345 tarbitratord on || :
+        ${csudo}chkconfig --add tarbitratord || :
+        ${csudo}chkconfig --level 2345 tarbitratord on || :
     elif ((${initd_mod}==2)); then
-        ${csudo} insserv tarbitratord || :
-        ${csudo} insserv -d tarbitratord || :
+        ${csudo}insserv tarbitratord || :
+        ${csudo}insserv -d tarbitratord || :
     elif ((${initd_mod}==3)); then
-        ${csudo} update-rc.d tarbitratord defaults || :
+        ${csudo}update-rc.d tarbitratord defaults || :
     fi
 }
 
@@ -237,11 +237,11 @@ function clean_service_on_systemd() {
   tarbitratord_service_config="${service_config_dir}/tarbitratord.service"
   if systemctl is-active --quiet tarbitratord; then
       echo "tarbitrator is running, stopping it..."
-      ${csudo} systemctl stop tarbitratord &> /dev/null || echo &> /dev/null
+      ${csudo}systemctl stop tarbitratord &> /dev/null || echo &> /dev/null
   fi
-  ${csudo} systemctl disable tarbitratord &> /dev/null || echo &> /dev/null
+  ${csudo}systemctl disable tarbitratord &> /dev/null || echo &> /dev/null
 
-  ${csudo} rm -f ${tarbitratord_service_config}
+  ${csudo}rm -f ${tarbitratord_service_config}
 }
 
 # taos:2345:respawn:/etc/init.d/tarbitratord start
@@ -251,27 +251,27 @@ function install_service_on_systemd() {
 
     tarbitratord_service_config="${service_config_dir}/tarbitratord.service"
 
-    ${csudo} bash -c "echo '[Unit]'                                  >> ${tarbitratord_service_config}"
-    ${csudo} bash -c "echo 'Description=TDengine arbitrator service' >> ${tarbitratord_service_config}"
-    ${csudo} bash -c "echo 'After=network-online.target'             >> ${tarbitratord_service_config}"
-    ${csudo} bash -c "echo 'Wants=network-online.target'             >> ${tarbitratord_service_config}"
-    ${csudo} bash -c "echo                                           >> ${tarbitratord_service_config}"
-    ${csudo} bash -c "echo '[Service]'                               >> ${tarbitratord_service_config}"
-    ${csudo} bash -c "echo 'Type=simple'                             >> ${tarbitratord_service_config}"
-    ${csudo} bash -c "echo 'ExecStart=/usr/bin/tarbitrator'          >> ${tarbitratord_service_config}"
-    ${csudo} bash -c "echo 'TimeoutStopSec=1000000s'                 >> ${tarbitratord_service_config}"
-    ${csudo} bash -c "echo 'LimitNOFILE=infinity'                    >> ${tarbitratord_service_config}"
-    ${csudo} bash -c "echo 'LimitNPROC=infinity'                     >> ${tarbitratord_service_config}"
-    ${csudo} bash -c "echo 'LimitCORE=infinity'                      >> ${tarbitratord_service_config}"
-    ${csudo} bash -c "echo 'TimeoutStartSec=0'                       >> ${tarbitratord_service_config}"
-    ${csudo} bash -c "echo 'StandardOutput=null'                     >> ${tarbitratord_service_config}"
-    ${csudo} bash -c "echo 'Restart=always'                          >> ${tarbitratord_service_config}"
-    ${csudo} bash -c "echo 'StartLimitBurst=3'                       >> ${tarbitratord_service_config}"
-    ${csudo} bash -c "echo 'StartLimitInterval=60s'                  >> ${tarbitratord_service_config}"
-    ${csudo} bash -c "echo                                           >> ${tarbitratord_service_config}"
-    ${csudo} bash -c "echo '[Install]'                               >> ${tarbitratord_service_config}"
-    ${csudo} bash -c "echo 'WantedBy=multi-user.target'              >> ${tarbitratord_service_config}"
-    ${csudo} systemctl enable tarbitratord
+    ${csudo}bash -c "echo '[Unit]'                                  >> ${tarbitratord_service_config}"
+    ${csudo}bash -c "echo 'Description=TDengine arbitrator service' >> ${tarbitratord_service_config}"
+    ${csudo}bash -c "echo 'After=network-online.target'             >> ${tarbitratord_service_config}"
+    ${csudo}bash -c "echo 'Wants=network-online.target'             >> ${tarbitratord_service_config}"
+    ${csudo}bash -c "echo                                           >> ${tarbitratord_service_config}"
+    ${csudo}bash -c "echo '[Service]'                               >> ${tarbitratord_service_config}"
+    ${csudo}bash -c "echo 'Type=simple'                             >> ${tarbitratord_service_config}"
+    ${csudo}bash -c "echo 'ExecStart=/usr/bin/tarbitrator'          >> ${tarbitratord_service_config}"
+    ${csudo}bash -c "echo 'TimeoutStopSec=1000000s'                 >> ${tarbitratord_service_config}"
+    ${csudo}bash -c "echo 'LimitNOFILE=infinity'                    >> ${tarbitratord_service_config}"
+    ${csudo}bash -c "echo 'LimitNPROC=infinity'                     >> ${tarbitratord_service_config}"
+    ${csudo}bash -c "echo 'LimitCORE=infinity'                      >> ${tarbitratord_service_config}"
+    ${csudo}bash -c "echo 'TimeoutStartSec=0'                       >> ${tarbitratord_service_config}"
+    ${csudo}bash -c "echo 'StandardOutput=null'                     >> ${tarbitratord_service_config}"
+    ${csudo}bash -c "echo 'Restart=always'                          >> ${tarbitratord_service_config}"
+    ${csudo}bash -c "echo 'StartLimitBurst=3'                       >> ${tarbitratord_service_config}"
+    ${csudo}bash -c "echo 'StartLimitInterval=60s'                  >> ${tarbitratord_service_config}"
+    ${csudo}bash -c "echo                                           >> ${tarbitratord_service_config}"
+    ${csudo}bash -c "echo '[Install]'                               >> ${tarbitratord_service_config}"
+    ${csudo}bash -c "echo 'WantedBy=multi-user.target'              >> ${tarbitratord_service_config}"
+    ${csudo}systemctl enable tarbitratord
 }
 
 function install_service() {
@@ -291,9 +291,9 @@ function update_TDengine() {
     # Stop the service if running
     if pidof tarbitrator &> /dev/null; then
         if ((${service_mod}==0)); then
-            ${csudo} systemctl stop tarbitratord || :
+            ${csudo}systemctl stop tarbitratord || :
         elif ((${service_mod}==1)); then
-            ${csudo} service tarbitratord stop || :
+            ${csudo}service tarbitratord stop || :
         else
             kill_tarbitrator
         fi
@@ -309,9 +309,9 @@ function update_TDengine() {
     echo
     #echo -e "${GREEN_DARK}To configure TDengine ${NC}: edit /etc/taos/taos.cfg"
     if ((${service_mod}==0)); then
-        echo -e "${GREEN_DARK}To start arbitrator     ${NC}: ${csudo} systemctl start tarbitratord${NC}"
+        echo -e "${GREEN_DARK}To start arbitrator     ${NC}: ${csudo}systemctl start tarbitratord${NC}"
     elif ((${service_mod}==1)); then
-        echo -e "${GREEN_DARK}To start arbitrator     ${NC}: ${csudo} service tarbitratord start${NC}"
+        echo -e "${GREEN_DARK}To start arbitrator     ${NC}: ${csudo}service tarbitratord start${NC}"
     else
         echo -e "${GREEN_DARK}To start arbitrator     ${NC}: ./tarbitrator${NC}"
     fi
@@ -332,9 +332,9 @@ function install_TDengine() {
     echo
     #echo -e "${GREEN_DARK}To configure TDengine ${NC}: edit /etc/taos/taos.cfg"
     if ((${service_mod}==0)); then
-        echo -e "${GREEN_DARK}To start arbitrator     ${NC}: ${csudo} systemctl start tarbitratord${NC}"
+        echo -e "${GREEN_DARK}To start arbitrator     ${NC}: ${csudo}systemctl start tarbitratord${NC}"
     elif ((${service_mod}==1)); then
-        echo -e "${GREEN_DARK}To start arbitrator     ${NC}: ${csudo} service tarbitratord start${NC}"
+        echo -e "${GREEN_DARK}To start arbitrator     ${NC}: ${csudo}service tarbitratord start${NC}"
     else
         echo -e "${GREEN_DARK}To start arbitrator     ${NC}: tarbitrator${NC}"
     fi

packaging/tools/install_arbi_jh.sh

@@ -29,7 +29,7 @@ NC='\033[0m'
 
 csudo=""
 if command -v sudo > /dev/null; then
-    csudo="sudo"
+    csudo="sudo "
 fi
 
 update_flag=0
@@ -91,60 +91,60 @@ fi
 function kill_tarbitrator() {
   pid=$(ps -ef | grep "tarbitrator" | grep -v "grep" | awk '{print $2}')
   if [ -n "$pid" ]; then
-    ${csudo} kill -9 $pid   || :
+    ${csudo}kill -9 $pid   || :
   fi
 }
 
 function install_main_path() {
     #create install main dir and all sub dir
-    ${csudo} rm -rf ${install_main_dir}    || :
-    ${csudo} mkdir -p ${install_main_dir}
-    ${csudo} mkdir -p ${install_main_dir}/bin  
-    #${csudo} mkdir -p ${install_main_dir}/include
-    ${csudo} mkdir -p ${install_main_dir}/init.d
+    ${csudo}rm -rf ${install_main_dir}    || :
+    ${csudo}mkdir -p ${install_main_dir}
+    ${csudo}mkdir -p ${install_main_dir}/bin  
+    #${csudo}mkdir -p ${install_main_dir}/include
+    ${csudo}mkdir -p ${install_main_dir}/init.d
 }
 
 function install_bin() {
     # Remove links
-    ${csudo} rm -f ${bin_link_dir}/rmtarbitrator   || :
-    ${csudo} rm -f ${bin_link_dir}/tarbitrator     || :
-    ${csudo} cp -r ${script_dir}/bin/* ${install_main_dir}/bin && ${csudo} chmod 0555 ${install_main_dir}/bin/*
+    ${csudo}rm -f ${bin_link_dir}/rmtarbitrator   || :
+    ${csudo}rm -f ${bin_link_dir}/tarbitrator     || :
+    ${csudo}cp -r ${script_dir}/bin/* ${install_main_dir}/bin && ${csudo}chmod 0555 ${install_main_dir}/bin/*
 
     #Make link
-    [ -x ${install_main_dir}/bin/remove_arbi_jh.sh ] && ${csudo} ln -s ${install_main_dir}/bin/remove_arbi_jh.sh ${bin_link_dir}/rmtarbitrator  || :
-    [ -x ${install_main_dir}/bin/tarbitrator ] && ${csudo} ln -s ${install_main_dir}/bin/tarbitrator ${bin_link_dir}/tarbitrator || :
+    [ -x ${install_main_dir}/bin/remove_arbi_jh.sh ] && ${csudo}ln -s ${install_main_dir}/bin/remove_arbi_jh.sh ${bin_link_dir}/rmtarbitrator  || :
+    [ -x ${install_main_dir}/bin/tarbitrator ] && ${csudo}ln -s ${install_main_dir}/bin/tarbitrator ${bin_link_dir}/tarbitrator || :
 }
 
 function install_header() {
-    ${csudo} rm -f ${inc_link_dir}/taos.h ${inc_link_dir}/taoserror.h    || :
-    ${csudo} cp -f ${script_dir}/inc/* ${install_main_dir}/include && ${csudo} chmod 644 ${install_main_dir}/include/*    
-    ${csudo} ln -s ${install_main_dir}/include/taos.h ${inc_link_dir}/taos.h
-    ${csudo} ln -s ${install_main_dir}/include/taoserror.h ${inc_link_dir}/taoserror.h
+    ${csudo}rm -f ${inc_link_dir}/taos.h ${inc_link_dir}/taoserror.h    || :
+    ${csudo}cp -f ${script_dir}/inc/* ${install_main_dir}/include && ${csudo}chmod 644 ${install_main_dir}/include/*    
+    ${csudo}ln -s ${install_main_dir}/include/taos.h ${inc_link_dir}/taos.h
+    ${csudo}ln -s ${install_main_dir}/include/taoserror.h ${inc_link_dir}/taoserror.h
 }
 
 function clean_service_on_sysvinit() {
     if pidof tarbitrator &> /dev/null; then
-        ${csudo} service tarbitratord stop || :
+        ${csudo}service tarbitratord stop || :
     fi
 
     if ((${initd_mod}==1)); then
       if [ -e ${service_config_dir}/tarbitratord ]; then 
-        ${csudo} chkconfig --del tarbitratord || :
+        ${csudo}chkconfig --del tarbitratord || :
       fi
     elif ((${initd_mod}==2)); then
       if [ -e ${service_config_dir}/tarbitratord ]; then
-        ${csudo} insserv -r tarbitratord || :
+        ${csudo}insserv -r tarbitratord || :
       fi
     elif ((${initd_mod}==3)); then
       if [ -e ${service_config_dir}/tarbitratord ]; then
-        ${csudo} update-rc.d -f tarbitratord remove || :
+        ${csudo}update-rc.d -f tarbitratord remove || :
       fi
     fi    
 
-    ${csudo} rm -f ${service_config_dir}/tarbitratord || :
+    ${csudo}rm -f ${service_config_dir}/tarbitratord || :
     
     if $(which init &> /dev/null); then
-        ${csudo} init q || :
+        ${csudo}init q || :
     fi
 }
 
@@ -154,21 +154,21 @@ function install_service_on_sysvinit() {
 
     # Install server service
     if ((${os_type}==1)); then
-        ${csudo} cp -f ${script_dir}/init.d/tarbitratord.deb ${install_main_dir}/init.d/tarbitratord
-        ${csudo} cp    ${script_dir}/init.d/tarbitratord.deb ${service_config_dir}/tarbitratord && ${csudo} chmod a+x ${service_config_dir}/tarbitratord
+        ${csudo}cp -f ${script_dir}/init.d/tarbitratord.deb ${install_main_dir}/init.d/tarbitratord
+        ${csudo}cp    ${script_dir}/init.d/tarbitratord.deb ${service_config_dir}/tarbitratord && ${csudo}chmod a+x ${service_config_dir}/tarbitratord
     elif ((${os_type}==2)); then
-        ${csudo} cp -f ${script_dir}/init.d/tarbitratord.rpm ${install_main_dir}/init.d/tarbitratord
-        ${csudo} cp    ${script_dir}/init.d/tarbitratord.rpm ${service_config_dir}/tarbitratord && ${csudo} chmod a+x ${service_config_dir}/tarbitratord
+        ${csudo}cp -f ${script_dir}/init.d/tarbitratord.rpm ${install_main_dir}/init.d/tarbitratord
+        ${csudo}cp    ${script_dir}/init.d/tarbitratord.rpm ${service_config_dir}/tarbitratord && ${csudo}chmod a+x ${service_config_dir}/tarbitratord
     fi
     
     if ((${initd_mod}==1)); then
-        ${csudo} chkconfig --add tarbitratord || :
-        ${csudo} chkconfig --level 2345 tarbitratord on || :
+        ${csudo}chkconfig --add tarbitratord || :
+        ${csudo}chkconfig --level 2345 tarbitratord on || :
     elif ((${initd_mod}==2)); then
-        ${csudo} insserv tarbitratord || :
-        ${csudo} insserv -d tarbitratord || :
+        ${csudo}insserv tarbitratord || :
+        ${csudo}insserv -d tarbitratord || :
     elif ((${initd_mod}==3)); then
-        ${csudo} update-rc.d tarbitratord defaults || :
+        ${csudo}update-rc.d tarbitratord defaults || :
     fi
 }
 
@@ -176,11 +176,11 @@ function clean_service_on_systemd() {
   tarbitratord_service_config="${service_config_dir}/tarbitratord.service"
   if systemctl is-active --quiet tarbitratord; then
       echo "tarbitrator is running, stopping it..."
-      ${csudo} systemctl stop tarbitratord &> /dev/null || echo &> /dev/null
+      ${csudo}systemctl stop tarbitratord &> /dev/null || echo &> /dev/null
   fi
-  ${csudo} systemctl disable tarbitratord &> /dev/null || echo &> /dev/null
+  ${csudo}systemctl disable tarbitratord &> /dev/null || echo &> /dev/null
 
-  ${csudo} rm -f ${tarbitratord_service_config}
+  ${csudo}rm -f ${tarbitratord_service_config}
 }
 
 function install_service_on_systemd() {
@@ -188,27 +188,27 @@ function install_service_on_systemd() {
 
     tarbitratord_service_config="${service_config_dir}/tarbitratord.service"
 
-    ${csudo} bash -c "echo '[Unit]'                                  >> ${tarbitratord_service_config}"
-    ${csudo} bash -c "echo 'Description=jh_iot arbitrator service' >> ${tarbitratord_service_config}"
-    ${csudo} bash -c "echo 'After=network-online.target'             >> ${tarbitratord_service_config}"
-    ${csudo} bash -c "echo 'Wants=network-online.target'             >> ${tarbitratord_service_config}"
-    ${csudo} bash -c "echo                                           >> ${tarbitratord_service_config}"
-    ${csudo} bash -c "echo '[Service]'                               >> ${tarbitratord_service_config}"
-    ${csudo} bash -c "echo 'Type=simple'                             >> ${tarbitratord_service_config}"
-    ${csudo} bash -c "echo 'ExecStart=/usr/bin/tarbitrator'          >> ${tarbitratord_service_config}"
-    ${csudo} bash -c "echo 'TimeoutStopSec=1000000s'                 >> ${tarbitratord_service_config}"
-    ${csudo} bash -c "echo 'LimitNOFILE=infinity'                    >> ${tarbitratord_service_config}"
-    ${csudo} bash -c "echo 'LimitNPROC=infinity'                     >> ${tarbitratord_service_config}"
-    ${csudo} bash -c "echo 'LimitCORE=infinity'                      >> ${tarbitratord_service_config}"
-    ${csudo} bash -c "echo 'TimeoutStartSec=0'                       >> ${tarbitratord_service_config}"
-    ${csudo} bash -c "echo 'StandardOutput=null'                     >> ${tarbitratord_service_config}"
-    ${csudo} bash -c "echo 'Restart=always'                          >> ${tarbitratord_service_config}"
-    ${csudo} bash -c "echo 'StartLimitBurst=3'                       >> ${tarbitratord_service_config}"
-    ${csudo} bash -c "echo 'StartLimitInterval=60s'                  >> ${tarbitratord_service_config}"
-    ${csudo} bash -c "echo                                           >> ${tarbitratord_service_config}"
-    ${csudo} bash -c "echo '[Install]'                               >> ${tarbitratord_service_config}"
-    ${csudo} bash -c "echo 'WantedBy=multi-user.target'              >> ${tarbitratord_service_config}"
-    ${csudo} systemctl enable tarbitratord
+    ${csudo}bash -c "echo '[Unit]'                                  >> ${tarbitratord_service_config}"
+    ${csudo}bash -c "echo 'Description=jh_iot arbitrator service' >> ${tarbitratord_service_config}"
+    ${csudo}bash -c "echo 'After=network-online.target'             >> ${tarbitratord_service_config}"
+    ${csudo}bash -c "echo 'Wants=network-online.target'             >> ${tarbitratord_service_config}"
+    ${csudo}bash -c "echo                                           >> ${tarbitratord_service_config}"
+    ${csudo}bash -c "echo '[Service]'                               >> ${tarbitratord_service_config}"
+    ${csudo}bash -c "echo 'Type=simple'                             >> ${tarbitratord_service_config}"
+    ${csudo}bash -c "echo 'ExecStart=/usr/bin/tarbitrator'          >> ${tarbitratord_service_config}"
+    ${csudo}bash -c "echo 'TimeoutStopSec=1000000s'                 >> ${tarbitratord_service_config}"
+    ${csudo}bash -c "echo 'LimitNOFILE=infinity'                    >> ${tarbitratord_service_config}"
+    ${csudo}bash -c "echo 'LimitNPROC=infinity'                     >> ${tarbitratord_service_config}"
+    ${csudo}bash -c "echo 'LimitCORE=infinity'                      >> ${tarbitratord_service_config}"
+    ${csudo}bash -c "echo 'TimeoutStartSec=0'                       >> ${tarbitratord_service_config}"
+    ${csudo}bash -c "echo 'StandardOutput=null'                     >> ${tarbitratord_service_config}"
+    ${csudo}bash -c "echo 'Restart=always'                          >> ${tarbitratord_service_config}"
+    ${csudo}bash -c "echo 'StartLimitBurst=3'                       >> ${tarbitratord_service_config}"
+    ${csudo}bash -c "echo 'StartLimitInterval=60s'                  >> ${tarbitratord_service_config}"
+    ${csudo}bash -c "echo                                           >> ${tarbitratord_service_config}"
+    ${csudo}bash -c "echo '[Install]'                               >> ${tarbitratord_service_config}"
+    ${csudo}bash -c "echo 'WantedBy=multi-user.target'              >> ${tarbitratord_service_config}"
+    ${csudo}systemctl enable tarbitratord
 }
 
 function install_service() {
@@ -227,9 +227,9 @@ function update() {
     # Stop the service if running
     if pidof tarbitrator &> /dev/null; then
         if ((${service_mod}==0)); then
-            ${csudo} systemctl stop tarbitratord || :
+            ${csudo}systemctl stop tarbitratord || :
         elif ((${service_mod}==1)); then
-            ${csudo} service tarbitratord stop || :
+            ${csudo}service tarbitratord stop || :
         else
             kill_tarbitrator
         fi
@@ -243,9 +243,9 @@ function update() {
 		
     echo
     if ((${service_mod}==0)); then
-        echo -e "${GREEN_DARK}To start arbitrator     ${NC}: ${csudo} systemctl start tarbitratord${NC}"
+        echo -e "${GREEN_DARK}To start arbitrator     ${NC}: ${csudo}systemctl start tarbitratord${NC}"
     elif ((${service_mod}==1)); then
-        echo -e "${GREEN_DARK}To start arbitrator     ${NC}: ${csudo} service tarbitratord start${NC}"
+        echo -e "${GREEN_DARK}To start arbitrator     ${NC}: ${csudo}service tarbitratord start${NC}"
     else
         echo -e "${GREEN_DARK}To start arbitrator     ${NC}: ./tarbitrator${NC}"
     fi                
@@ -263,9 +263,9 @@ function install() {
     install_service
     echo
     if ((${service_mod}==0)); then
-        echo -e "${GREEN_DARK}To start arbitrator     ${NC}: ${csudo} systemctl start tarbitratord${NC}"
+        echo -e "${GREEN_DARK}To start arbitrator     ${NC}: ${csudo}systemctl start tarbitratord${NC}"
     elif ((${service_mod}==1)); then
-        echo -e "${GREEN_DARK}To start arbitrator     ${NC}: ${csudo} service tarbitratord start${NC}"
+        echo -e "${GREEN_DARK}To start arbitrator     ${NC}: ${csudo}service tarbitratord start${NC}"
     else
         echo -e "${GREEN_DARK}To start arbitrator     ${NC}: tarbitrator${NC}"
     fi

packaging/tools/install_arbi_kh.sh

@@ -29,7 +29,7 @@ NC='\033[0m'
 
 csudo=""
 if command -v sudo > /dev/null; then
-    csudo="sudo"
+    csudo="sudo "
 fi
 
 update_flag=0
@@ -91,60 +91,60 @@ fi
 function kill_tarbitrator() {
   pid=$(ps -ef | grep "tarbitrator" | grep -v "grep" | awk '{print $2}')
   if [ -n "$pid" ]; then
-    ${csudo} kill -9 $pid   || :
+    ${csudo}kill -9 $pid   || :
   fi
 }
 
 function install_main_path() {
     #create install main dir and all sub dir
-    ${csudo} rm -rf ${install_main_dir}    || :
-    ${csudo} mkdir -p ${install_main_dir}
-    ${csudo} mkdir -p ${install_main_dir}/bin  
-    #${csudo} mkdir -p ${install_main_dir}/include
-    ${csudo} mkdir -p ${install_main_dir}/init.d
+    ${csudo}rm -rf ${install_main_dir}    || :
+    ${csudo}mkdir -p ${install_main_dir}
+    ${csudo}mkdir -p ${install_main_dir}/bin  
+    #${csudo}mkdir -p ${install_main_dir}/include
+    ${csudo}mkdir -p ${install_main_dir}/init.d
 }
 
 function install_bin() {
     # Remove links
-    ${csudo} rm -f ${bin_link_dir}/rmtarbitrator   || :
-    ${csudo} rm -f ${bin_link_dir}/tarbitrator     || :
-    ${csudo} cp -r ${script_dir}/bin/* ${install_main_dir}/bin && ${csudo} chmod 0555 ${install_main_dir}/bin/*
+    ${csudo}rm -f ${bin_link_dir}/rmtarbitrator   || :
+    ${csudo}rm -f ${bin_link_dir}/tarbitrator     || :
+    ${csudo}cp -r ${script_dir}/bin/* ${install_main_dir}/bin && ${csudo}chmod 0555 ${install_main_dir}/bin/*
 
     #Make link
-    [ -x ${install_main_dir}/bin/remove_arbi_kh.sh ] && ${csudo} ln -s ${install_main_dir}/bin/remove_arbi_kh.sh ${bin_link_dir}/rmtarbitrator  || :
-    [ -x ${install_main_dir}/bin/tarbitrator ] && ${csudo} ln -s ${install_main_dir}/bin/tarbitrator ${bin_link_dir}/tarbitrator || :
+    [ -x ${install_main_dir}/bin/remove_arbi_kh.sh ] && ${csudo}ln -s ${install_main_dir}/bin/remove_arbi_kh.sh ${bin_link_dir}/rmtarbitrator  || :
+    [ -x ${install_main_dir}/bin/tarbitrator ] && ${csudo}ln -s ${install_main_dir}/bin/tarbitrator ${bin_link_dir}/tarbitrator || :
 }
 
 function install_header() {
-    ${csudo} rm -f ${inc_link_dir}/taos.h ${inc_link_dir}/taoserror.h    || :
-    ${csudo} cp -f ${script_dir}/inc/* ${install_main_dir}/include && ${csudo} chmod 644 ${install_main_dir}/include/*    
-    ${csudo} ln -s ${install_main_dir}/include/taos.h ${inc_link_dir}/taos.h
-    ${csudo} ln -s ${install_main_dir}/include/taoserror.h ${inc_link_dir}/taoserror.h
+    ${csudo}rm -f ${inc_link_dir}/taos.h ${inc_link_dir}/taoserror.h    || :
+    ${csudo}cp -f ${script_dir}/inc/* ${install_main_dir}/include && ${csudo}chmod 644 ${install_main_dir}/include/*    
+    ${csudo}ln -s ${install_main_dir}/include/taos.h ${inc_link_dir}/taos.h
+    ${csudo}ln -s ${install_main_dir}/include/taoserror.h ${inc_link_dir}/taoserror.h
 }
 
 function clean_service_on_sysvinit() {
     if pidof tarbitrator &> /dev/null; then
-        ${csudo} service tarbitratord stop || :
+        ${csudo}service tarbitratord stop || :
     fi
 
     if ((${initd_mod}==1)); then
       if [ -e ${service_config_dir}/tarbitratord ]; then 
-        ${csudo} chkconfig --del tarbitratord || :
+        ${csudo}chkconfig --del tarbitratord || :
       fi
     elif ((${initd_mod}==2)); then
       if [ -e ${service_config_dir}/tarbitratord ]; then
-        ${csudo} insserv -r tarbitratord || :
+        ${csudo}insserv -r tarbitratord || :
       fi
     elif ((${initd_mod}==3)); then
       if [ -e ${service_config_dir}/tarbitratord ]; then
-        ${csudo} update-rc.d -f tarbitratord remove || :
+        ${csudo}update-rc.d -f tarbitratord remove || :
       fi
     fi    
 
-    ${csudo} rm -f ${service_config_dir}/tarbitratord || :
+    ${csudo}rm -f ${service_config_dir}/tarbitratord || :
     
     if $(which init &> /dev/null); then
-        ${csudo} init q || :
+        ${csudo}init q || :
     fi
 }
 
@@ -154,21 +154,21 @@ function install_service_on_sysvinit() {
 
     # Install khserver service
     if ((${os_type}==1)); then
-        ${csudo} cp -f ${script_dir}/init.d/tarbitratord.deb ${install_main_dir}/init.d/tarbitratord
-        ${csudo} cp    ${script_dir}/init.d/tarbitratord.deb ${service_config_dir}/tarbitratord && ${csudo} chmod a+x ${service_config_dir}/tarbitratord
+        ${csudo}cp -f ${script_dir}/init.d/tarbitratord.deb ${install_main_dir}/init.d/tarbitratord
+        ${csudo}cp    ${script_dir}/init.d/tarbitratord.deb ${service_config_dir}/tarbitratord && ${csudo}chmod a+x ${service_config_dir}/tarbitratord
     elif ((${os_type}==2)); then
-        ${csudo} cp -f ${script_dir}/init.d/tarbitratord.rpm ${install_main_dir}/init.d/tarbitratord
-        ${csudo} cp    ${script_dir}/init.d/tarbitratord.rpm ${service_config_dir}/tarbitratord && ${csudo} chmod a+x ${service_config_dir}/tarbitratord
+        ${csudo}cp -f ${script_dir}/init.d/tarbitratord.rpm ${install_main_dir}/init.d/tarbitratord
+        ${csudo}cp    ${script_dir}/init.d/tarbitratord.rpm ${service_config_dir}/tarbitratord && ${csudo}chmod a+x ${service_config_dir}/tarbitratord
     fi
     
     if ((${initd_mod}==1)); then
-        ${csudo} chkconfig --add tarbitratord || :
-        ${csudo} chkconfig --level 2345 tarbitratord on || :
+        ${csudo}chkconfig --add tarbitratord || :
+        ${csudo}chkconfig --level 2345 tarbitratord on || :
     elif ((${initd_mod}==2)); then
-        ${csudo} insserv tarbitratord || :
-        ${csudo} insserv -d tarbitratord || :
+        ${csudo}insserv tarbitratord || :
+        ${csudo}insserv -d tarbitratord || :
     elif ((${initd_mod}==3)); then
-        ${csudo} update-rc.d tarbitratord defaults || :
+        ${csudo}update-rc.d tarbitratord defaults || :
     fi
 }
 
@@ -176,11 +176,11 @@ function clean_service_on_systemd() {
   tarbitratord_service_config="${service_config_dir}/tarbitratord.service"
   if systemctl is-active --quiet tarbitratord; then
       echo "tarbitrator is running, stopping it..."
-      ${csudo} systemctl stop tarbitratord &> /dev/null || echo &> /dev/null
+      ${csudo}systemctl stop tarbitratord &> /dev/null || echo &> /dev/null
   fi
-  ${csudo} systemctl disable tarbitratord &> /dev/null || echo &> /dev/null
+  ${csudo}systemctl disable tarbitratord &> /dev/null || echo &> /dev/null
 
-  ${csudo} rm -f ${tarbitratord_service_config}
+  ${csudo}rm -f ${tarbitratord_service_config}
 }
 
 function install_service_on_systemd() {
@@ -188,27 +188,27 @@ function install_service_on_systemd() {
 
     tarbitratord_service_config="${service_config_dir}/tarbitratord.service"
 
-    ${csudo} bash -c "echo '[Unit]'                                  >> ${tarbitratord_service_config}"
-    ${csudo} bash -c "echo 'Description=KingHistorian arbitrator service' >> ${tarbitratord_service_config}"
-    ${csudo} bash -c "echo 'After=network-online.target'             >> ${tarbitratord_service_config}"
-    ${csudo} bash -c "echo 'Wants=network-online.target'             >> ${tarbitratord_service_config}"
-    ${csudo} bash -c "echo                                           >> ${tarbitratord_service_config}"
-    ${csudo} bash -c "echo '[Service]'                               >> ${tarbitratord_service_config}"
-    ${csudo} bash -c "echo 'Type=simple'                             >> ${tarbitratord_service_config}"
-    ${csudo} bash -c "echo 'ExecStart=/usr/bin/tarbitrator'          >> ${tarbitratord_service_config}"
-    ${csudo} bash -c "echo 'TimeoutStopSec=1000000s'                 >> ${tarbitratord_service_config}"
-    ${csudo} bash -c "echo 'LimitNOFILE=infinity'                    >> ${tarbitratord_service_config}"
-    ${csudo} bash -c "echo 'LimitNPROC=infinity'                     >> ${tarbitratord_service_config}"
-    ${csudo} bash -c "echo 'LimitCORE=infinity'                      >> ${tarbitratord_service_config}"
-    ${csudo} bash -c "echo 'TimeoutStartSec=0'                       >> ${tarbitratord_service_config}"
-    ${csudo} bash -c "echo 'StandardOutput=null'                     >> ${tarbitratord_service_config}"
-    ${csudo} bash -c "echo 'Restart=always'                          >> ${tarbitratord_service_config}"
-    ${csudo} bash -c "echo 'StartLimitBurst=3'                       >> ${tarbitratord_service_config}"
-    ${csudo} bash -c "echo 'StartLimitInterval=60s'                  >> ${tarbitratord_service_config}"
-    ${csudo} bash -c "echo                                           >> ${tarbitratord_service_config}"
-    ${csudo} bash -c "echo '[Install]'                               >> ${tarbitratord_service_config}"
-    ${csudo} bash -c "echo 'WantedBy=multi-user.target'              >> ${tarbitratord_service_config}"
-    ${csudo} systemctl enable tarbitratord
+    ${csudo}bash -c "echo '[Unit]'                                  >> ${tarbitratord_service_config}"
+    ${csudo}bash -c "echo 'Description=KingHistorian arbitrator service' >> ${tarbitratord_service_config}"
+    ${csudo}bash -c "echo 'After=network-online.target'             >> ${tarbitratord_service_config}"
+    ${csudo}bash -c "echo 'Wants=network-online.target'             >> ${tarbitratord_service_config}"
+    ${csudo}bash -c "echo                                           >> ${tarbitratord_service_config}"
+    ${csudo}bash -c "echo '[Service]'                               >> ${tarbitratord_service_config}"
+    ${csudo}bash -c "echo 'Type=simple'                             >> ${tarbitratord_service_config}"
+    ${csudo}bash -c "echo 'ExecStart=/usr/bin/tarbitrator'          >> ${tarbitratord_service_config}"
+    ${csudo}bash -c "echo 'TimeoutStopSec=1000000s'                 >> ${tarbitratord_service_config}"
+    ${csudo}bash -c "echo 'LimitNOFILE=infinity'                    >> ${tarbitratord_service_config}"
+    ${csudo}bash -c "echo 'LimitNPROC=infinity'                     >> ${tarbitratord_service_config}"
+    ${csudo}bash -c "echo 'LimitCORE=infinity'                      >> ${tarbitratord_service_config}"
+    ${csudo}bash -c "echo 'TimeoutStartSec=0'                       >> ${tarbitratord_service_config}"
+    ${csudo}bash -c "echo 'StandardOutput=null'                     >> ${tarbitratord_service_config}"
+    ${csudo}bash -c "echo 'Restart=always'                          >> ${tarbitratord_service_config}"
+    ${csudo}bash -c "echo 'StartLimitBurst=3'                       >> ${tarbitratord_service_config}"
+    ${csudo}bash -c "echo 'StartLimitInterval=60s'                  >> ${tarbitratord_service_config}"
+    ${csudo}bash -c "echo                                           >> ${tarbitratord_service_config}"
+    ${csudo}bash -c "echo '[Install]'                               >> ${tarbitratord_service_config}"
+    ${csudo}bash -c "echo 'WantedBy=multi-user.target'              >> ${tarbitratord_service_config}"
+    ${csudo}systemctl enable tarbitratord
 }
 
 function install_service() {
@@ -227,9 +227,9 @@ function update() {
     # Stop the service if running
     if pidof tarbitrator &> /dev/null; then
         if ((${service_mod}==0)); then
-            ${csudo} systemctl stop tarbitratord || :
+            ${csudo}systemctl stop tarbitratord || :
         elif ((${service_mod}==1)); then
-            ${csudo} service tarbitratord stop || :
+            ${csudo}service tarbitratord stop || :
         else
             kill_tarbitrator
         fi
@@ -243,9 +243,9 @@ function update() {
 		
     echo
     if ((${service_mod}==0)); then
-        echo -e "${GREEN_DARK}To start arbitrator     ${NC}: ${csudo} systemctl start tarbitratord${NC}"
+        echo -e "${GREEN_DARK}To start arbitrator     ${NC}: ${csudo}systemctl start tarbitratord${NC}"
     elif ((${service_mod}==1)); then
-        echo -e "${GREEN_DARK}To start arbitrator     ${NC}: ${csudo} service tarbitratord start${NC}"
+        echo -e "${GREEN_DARK}To start arbitrator     ${NC}: ${csudo}service tarbitratord start${NC}"
     else
         echo -e "${GREEN_DARK}To start arbitrator     ${NC}: ./tarbitrator${NC}"
     fi                
@@ -263,9 +263,9 @@ function install() {
     install_service
     echo
     if ((${service_mod}==0)); then
-        echo -e "${GREEN_DARK}To start arbitrator     ${NC}: ${csudo} systemctl start tarbitratord${NC}"
+        echo -e "${GREEN_DARK}To start arbitrator     ${NC}: ${csudo}systemctl start tarbitratord${NC}"
     elif ((${service_mod}==1)); then
-        echo -e "${GREEN_DARK}To start arbitrator     ${NC}: ${csudo} service tarbitratord start${NC}"
+        echo -e "${GREEN_DARK}To start arbitrator     ${NC}: ${csudo}service tarbitratord start${NC}"
     else
         echo -e "${GREEN_DARK}To start arbitrator     ${NC}: tarbitrator${NC}"
     fi

packaging/tools/install_arbi_power.sh

@@ -29,7 +29,7 @@ NC='\033[0m'
 
 csudo=""
 if command -v sudo > /dev/null; then
-    csudo="sudo"
+    csudo="sudo "
 fi
 
 update_flag=0
@@ -91,77 +91,77 @@ fi
 function kill_tarbitrator() {
   pid=$(ps -ef | grep "tarbitrator" | grep -v "grep" | awk '{print $2}')
   if [ -n "$pid" ]; then
-    ${csudo} kill -9 $pid   || :
+    ${csudo}kill -9 $pid   || :
   fi
 }
 
 function install_main_path() {
     #create install main dir and all sub dir
-    ${csudo} rm -rf ${install_main_dir}    || :
-    ${csudo} mkdir -p ${install_main_dir}
-    ${csudo} mkdir -p ${install_main_dir}/bin
-    #${csudo} mkdir -p ${install_main_dir}/include
-    ${csudo} mkdir -p ${install_main_dir}/init.d
+    ${csudo}rm -rf ${install_main_dir}    || :
+    ${csudo}mkdir -p ${install_main_dir}
+    ${csudo}mkdir -p ${install_main_dir}/bin
+    #${csudo}mkdir -p ${install_main_dir}/include
+    ${csudo}mkdir -p ${install_main_dir}/init.d
 }
 
 function install_bin() {
     # Remove links
-    ${csudo} rm -f ${bin_link_dir}/rmtarbitrator   || :
-    ${csudo} rm -f ${bin_link_dir}/tarbitrator     || :
-    ${csudo} cp -r ${script_dir}/bin/* ${install_main_dir}/bin && ${csudo} chmod 0555 ${install_main_dir}/bin/*
+    ${csudo}rm -f ${bin_link_dir}/rmtarbitrator   || :
+    ${csudo}rm -f ${bin_link_dir}/tarbitrator     || :
+    ${csudo}cp -r ${script_dir}/bin/* ${install_main_dir}/bin && ${csudo}chmod 0555 ${install_main_dir}/bin/*
 
     #Make link
-    [ -x ${install_main_dir}/bin/remove_arbi_power.sh ] && ${csudo} ln -s ${install_main_dir}/bin/remove_arbi_power.sh ${bin_link_dir}/rmtarbitrator  || :
-    [ -x ${install_main_dir}/bin/tarbitrator ] && ${csudo} ln -s ${install_main_dir}/bin/tarbitrator ${bin_link_dir}/tarbitrator || :
+    [ -x ${install_main_dir}/bin/remove_arbi_power.sh ] && ${csudo}ln -s ${install_main_dir}/bin/remove_arbi_power.sh ${bin_link_dir}/rmtarbitrator  || :
+    [ -x ${install_main_dir}/bin/tarbitrator ] && ${csudo}ln -s ${install_main_dir}/bin/tarbitrator ${bin_link_dir}/tarbitrator || :
 }
 
 function install_jemalloc() {
     jemalloc_dir=${script_dir}/jemalloc
 
     if [ -d ${jemalloc_dir} ]; then
-        ${csudo} /usr/bin/install -c -d /usr/local/bin
+        ${csudo}/usr/bin/install -c -d /usr/local/bin
 
         if [ -f ${jemalloc_dir}/bin/jemalloc-config ]; then
-            ${csudo} /usr/bin/install -c -m 755 ${jemalloc_dir}/bin/jemalloc-config /usr/local/bin
+            ${csudo}/usr/bin/install -c -m 755 ${jemalloc_dir}/bin/jemalloc-config /usr/local/bin
         fi
         if [ -f ${jemalloc_dir}/bin/jemalloc.sh ]; then
-            ${csudo} /usr/bin/install -c -m 755 ${jemalloc_dir}/bin/jemalloc.sh /usr/local/bin
+            ${csudo}/usr/bin/install -c -m 755 ${jemalloc_dir}/bin/jemalloc.sh /usr/local/bin
         fi
         if [ -f ${jemalloc_dir}/bin/jeprof ]; then
-            ${csudo} /usr/bin/install -c -m 755 ${jemalloc_dir}/bin/jeprof /usr/local/bin
+            ${csudo}/usr/bin/install -c -m 755 ${jemalloc_dir}/bin/jeprof /usr/local/bin
         fi
         if [ -f ${jemalloc_dir}/include/jemalloc/jemalloc.h ]; then
-            ${csudo} /usr/bin/install -c -d /usr/local/include/jemalloc
-            ${csudo} /usr/bin/install -c -m 644 ${jemalloc_dir}/include/jemalloc/jemalloc.h /usr/local/include/jemalloc
+            ${csudo}/usr/bin/install -c -d /usr/local/include/jemalloc
+            ${csudo}/usr/bin/install -c -m 644 ${jemalloc_dir}/include/jemalloc/jemalloc.h /usr/local/include/jemalloc
         fi
         if [ -f ${jemalloc_dir}/lib/libjemalloc.so.2 ]; then
-            ${csudo} /usr/bin/install -c -d /usr/local/lib
-            ${csudo} /usr/bin/install -c -m 755 ${jemalloc_dir}/lib/libjemalloc.so.2 /usr/local/lib
-            ${csudo} ln -sf libjemalloc.so.2 /usr/local/lib/libjemalloc.so
-            ${csudo} /usr/bin/install -c -d /usr/local/lib
+            ${csudo}/usr/bin/install -c -d /usr/local/lib
+            ${csudo}/usr/bin/install -c -m 755 ${jemalloc_dir}/lib/libjemalloc.so.2 /usr/local/lib
+            ${csudo}ln -sf libjemalloc.so.2 /usr/local/lib/libjemalloc.so
+            ${csudo}/usr/bin/install -c -d /usr/local/lib
             if [ -f ${jemalloc_dir}/lib/libjemalloc.a ]; then
-                ${csudo} /usr/bin/install -c -m 755 ${jemalloc_dir}/lib/libjemalloc.a /usr/local/lib
+                ${csudo}/usr/bin/install -c -m 755 ${jemalloc_dir}/lib/libjemalloc.a /usr/local/lib
             fi
             if [ -f ${jemalloc_dir}/lib/libjemalloc_pic.a ]; then
-                ${csudo} /usr/bin/install -c -m 755 ${jemalloc_dir}/lib/libjemalloc_pic.a /usr/local/lib
+                ${csudo}/usr/bin/install -c -m 755 ${jemalloc_dir}/lib/libjemalloc_pic.a /usr/local/lib
             fi
             if [ -f ${jemalloc_dir}/lib/libjemalloc_pic.a ]; then
-                ${csudo} /usr/bin/install -c -d /usr/local/lib/pkgconfig
-                ${csudo} /usr/bin/install -c -m 644 ${jemalloc_dir}/lib/pkgconfig/jemalloc.pc /usr/local/lib/pkgconfig
+                ${csudo}/usr/bin/install -c -d /usr/local/lib/pkgconfig
+                ${csudo}/usr/bin/install -c -m 644 ${jemalloc_dir}/lib/pkgconfig/jemalloc.pc /usr/local/lib/pkgconfig
             fi
         fi
         if [ -f ${jemalloc_dir}/share/doc/jemalloc/jemalloc.html ]; then
-            ${csudo} /usr/bin/install -c -d /usr/local/share/doc/jemalloc
-            ${csudo} /usr/bin/install -c -m 644 ${jemalloc_dir}/share/doc/jemalloc/jemalloc.html /usr/local/share/doc/jemalloc
+            ${csudo}/usr/bin/install -c -d /usr/local/share/doc/jemalloc
+            ${csudo}/usr/bin/install -c -m 644 ${jemalloc_dir}/share/doc/jemalloc/jemalloc.html /usr/local/share/doc/jemalloc
         fi
         if [ -f ${jemalloc_dir}/share/man/man3/jemalloc.3 ]; then
-            ${csudo} /usr/bin/install -c -d /usr/local/share/man/man3
-            ${csudo} /usr/bin/install -c -m 644 ${jemalloc_dir}/share/man/man3/jemalloc.3 /usr/local/share/man/man3
+            ${csudo}/usr/bin/install -c -d /usr/local/share/man/man3
+            ${csudo}/usr/bin/install -c -m 644 ${jemalloc_dir}/share/man/man3/jemalloc.3 /usr/local/share/man/man3
         fi
 
         if [ -d /etc/ld.so.conf.d ]; then
-            echo "/usr/local/lib" | ${csudo} tee /etc/ld.so.conf.d/jemalloc.conf > /dev/null || echo -e "failed to write /etc/ld.so.conf.d/jemalloc.conf"
-            ${csudo} ldconfig
+            echo "/usr/local/lib" | ${csudo}tee /etc/ld.so.conf.d/jemalloc.conf > /dev/null || echo -e "failed to write /etc/ld.so.conf.d/jemalloc.conf"
+            ${csudo}ldconfig
         else
             echo "/etc/ld.so.conf.d not found!"
         fi
@@ -169,36 +169,36 @@ function install_jemalloc() {
 }
 
 function install_header() {
-    ${csudo} rm -f ${inc_link_dir}/taos.h ${inc_link_dir}/taosdef.h ${inc_link_dir}/taoserror.h    || :
-    ${csudo} cp -f ${script_dir}/inc/* ${install_main_dir}/include && ${csudo} chmod 644 ${install_main_dir}/include/*
-    ${csudo} ln -s ${install_main_dir}/include/taos.h ${inc_link_dir}/taos.h
-    ${csudo} ln -s ${install_main_dir}/include/taosdef.h ${inc_link_dir}/taosdef.h
-    ${csudo} ln -s ${install_main_dir}/include/taoserror.h ${inc_link_dir}/taoserror.h
+    ${csudo}rm -f ${inc_link_dir}/taos.h ${inc_link_dir}/taosdef.h ${inc_link_dir}/taoserror.h    || :
+    ${csudo}cp -f ${script_dir}/inc/* ${install_main_dir}/include && ${csudo}chmod 644 ${install_main_dir}/include/*
+    ${csudo}ln -s ${install_main_dir}/include/taos.h ${inc_link_dir}/taos.h
+    ${csudo}ln -s ${install_main_dir}/include/taosdef.h ${inc_link_dir}/taosdef.h
+    ${csudo}ln -s ${install_main_dir}/include/taoserror.h ${inc_link_dir}/taoserror.h
 }
 
 function clean_service_on_sysvinit() {
     if pidof tarbitrator &> /dev/null; then
-        ${csudo} service tarbitratord stop || :
+        ${csudo}service tarbitratord stop || :
     fi
 
     if ((${initd_mod}==1)); then
       if [ -e ${service_config_dir}/tarbitratord ]; then
-        ${csudo} chkconfig --del tarbitratord || :
+        ${csudo}chkconfig --del tarbitratord || :
       fi
     elif ((${initd_mod}==2)); then
       if [ -e ${service_config_dir}/tarbitratord ]; then
-        ${csudo} insserv -r tarbitratord || :
+        ${csudo}insserv -r tarbitratord || :
       fi
     elif ((${initd_mod}==3)); then
       if [ -e ${service_config_dir}/tarbitratord ]; then
-        ${csudo} update-rc.d -f tarbitratord remove || :
+        ${csudo}update-rc.d -f tarbitratord remove || :
       fi
     fi
 
-    ${csudo} rm -f ${service_config_dir}/tarbitratord || :
+    ${csudo}rm -f ${service_config_dir}/tarbitratord || :
 
     if $(which init &> /dev/null); then
-        ${csudo} init q || :
+        ${csudo}init q || :
     fi
 }
 
@@ -209,24 +209,24 @@ function install_service_on_sysvinit() {
     # Install powerd service
 
     if ((${os_type}==1)); then
-        ${csudo} cp -f ${script_dir}/init.d/tarbitratord.deb ${install_main_dir}/init.d/tarbitratord
-        ${csudo} cp    ${script_dir}/init.d/tarbitratord.deb ${service_config_dir}/tarbitratord && ${csudo} chmod a+x ${service_config_dir}/tarbitratord
+        ${csudo}cp -f ${script_dir}/init.d/tarbitratord.deb ${install_main_dir}/init.d/tarbitratord
+        ${csudo}cp    ${script_dir}/init.d/tarbitratord.deb ${service_config_dir}/tarbitratord && ${csudo}chmod a+x ${service_config_dir}/tarbitratord
     elif ((${os_type}==2)); then
-        ${csudo} cp -f ${script_dir}/init.d/tarbitratord.rpm ${install_main_dir}/init.d/tarbitratord
-        ${csudo} cp    ${script_dir}/init.d/tarbitratord.rpm ${service_config_dir}/tarbitratord && ${csudo} chmod a+x ${service_config_dir}/tarbitratord
+        ${csudo}cp -f ${script_dir}/init.d/tarbitratord.rpm ${install_main_dir}/init.d/tarbitratord
+        ${csudo}cp    ${script_dir}/init.d/tarbitratord.rpm ${service_config_dir}/tarbitratord && ${csudo}chmod a+x ${service_config_dir}/tarbitratord
     fi
 
     #restart_config_str="power:2345:respawn:${service_config_dir}/powerd start"
-    #${csudo} grep -q -F "$restart_config_str" /etc/inittab || ${csudo} bash -c "echo '${restart_config_str}' >> /etc/inittab"
+    #${csudo}grep -q -F "$restart_config_str" /etc/inittab || ${csudo}bash -c "echo '${restart_config_str}' >> /etc/inittab"
 
     if ((${initd_mod}==1)); then
-        ${csudo} chkconfig --add tarbitratord || :
-        ${csudo} chkconfig --level 2345 tarbitratord on || :
+        ${csudo}chkconfig --add tarbitratord || :
+        ${csudo}chkconfig --level 2345 tarbitratord on || :
     elif ((${initd_mod}==2)); then
-        ${csudo} insserv tarbitratord || :
-        ${csudo} insserv -d tarbitratord || :
+        ${csudo}insserv tarbitratord || :
+        ${csudo}insserv -d tarbitratord || :
     elif ((${initd_mod}==3)); then
-        ${csudo} update-rc.d tarbitratord defaults || :
+        ${csudo}update-rc.d tarbitratord defaults || :
     fi
 }
 
@@ -234,11 +234,11 @@ function clean_service_on_systemd() {
   tarbitratord_service_config="${service_config_dir}/tarbitratord.service"
   if systemctl is-active --quiet tarbitratord; then
       echo "tarbitrator is running, stopping it..."
-      ${csudo} systemctl stop tarbitratord &> /dev/null || echo &> /dev/null
+      ${csudo}systemctl stop tarbitratord &> /dev/null || echo &> /dev/null
   fi
-  ${csudo} systemctl disable tarbitratord &> /dev/null || echo &> /dev/null
+  ${csudo}systemctl disable tarbitratord &> /dev/null || echo &> /dev/null
 
-  ${csudo} rm -f ${tarbitratord_service_config}
+  ${csudo}rm -f ${tarbitratord_service_config}
 }
 
 # power:2345:respawn:/etc/init.d/tarbitratord start
@@ -248,27 +248,27 @@ function install_service_on_systemd() {
 
     tarbitratord_service_config="${service_config_dir}/tarbitratord.service"
 
-    ${csudo} bash -c "echo '[Unit]'                                  >> ${tarbitratord_service_config}"
-    ${csudo} bash -c "echo 'Description=PowerDB arbitrator service' >> ${tarbitratord_service_config}"
-    ${csudo} bash -c "echo 'After=network-online.target'             >> ${tarbitratord_service_config}"
-    ${csudo} bash -c "echo 'Wants=network-online.target'             >> ${tarbitratord_service_config}"
-    ${csudo} bash -c "echo                                           >> ${tarbitratord_service_config}"
-    ${csudo} bash -c "echo '[Service]'                               >> ${tarbitratord_service_config}"
-    ${csudo} bash -c "echo 'Type=simple'                             >> ${tarbitratord_service_config}"
-    ${csudo} bash -c "echo 'ExecStart=/usr/bin/tarbitrator'          >> ${tarbitratord_service_config}"
-    ${csudo} bash -c "echo 'TimeoutStopSec=1000000s'                 >> ${tarbitratord_service_config}"
-    ${csudo} bash -c "echo 'LimitNOFILE=infinity'                    >> ${tarbitratord_service_config}"
-    ${csudo} bash -c "echo 'LimitNPROC=infinity'                     >> ${tarbitratord_service_config}"
-    ${csudo} bash -c "echo 'LimitCORE=infinity'                      >> ${tarbitratord_service_config}"
-    ${csudo} bash -c "echo 'TimeoutStartSec=0'                       >> ${tarbitratord_service_config}"
-    ${csudo} bash -c "echo 'StandardOutput=null'                     >> ${tarbitratord_service_config}"
-    ${csudo} bash -c "echo 'Restart=always'                          >> ${tarbitratord_service_config}"
-    ${csudo} bash -c "echo 'StartLimitBurst=3'                       >> ${tarbitratord_service_config}"
-    ${csudo} bash -c "echo 'StartLimitInterval=60s'                  >> ${tarbitratord_service_config}"
-    ${csudo} bash -c "echo                                           >> ${tarbitratord_service_config}"
-    ${csudo} bash -c "echo '[Install]'                               >> ${tarbitratord_service_config}"
-    ${csudo} bash -c "echo 'WantedBy=multi-user.target'              >> ${tarbitratord_service_config}"
-    ${csudo} systemctl enable tarbitratord
+    ${csudo}bash -c "echo '[Unit]'                                  >> ${tarbitratord_service_config}"
+    ${csudo}bash -c "echo 'Description=PowerDB arbitrator service' >> ${tarbitratord_service_config}"
+    ${csudo}bash -c "echo 'After=network-online.target'             >> ${tarbitratord_service_config}"
+    ${csudo}bash -c "echo 'Wants=network-online.target'             >> ${tarbitratord_service_config}"
+    ${csudo}bash -c "echo                                           >> ${tarbitratord_service_config}"
+    ${csudo}bash -c "echo '[Service]'                               >> ${tarbitratord_service_config}"
+    ${csudo}bash -c "echo 'Type=simple'                             >> ${tarbitratord_service_config}"
+    ${csudo}bash -c "echo 'ExecStart=/usr/bin/tarbitrator'          >> ${tarbitratord_service_config}"
+    ${csudo}bash -c "echo 'TimeoutStopSec=1000000s'                 >> ${tarbitratord_service_config}"
+    ${csudo}bash -c "echo 'LimitNOFILE=infinity'                    >> ${tarbitratord_service_config}"
+    ${csudo}bash -c "echo 'LimitNPROC=infinity'                     >> ${tarbitratord_service_config}"
+    ${csudo}bash -c "echo 'LimitCORE=infinity'                      >> ${tarbitratord_service_config}"
+    ${csudo}bash -c "echo 'TimeoutStartSec=0'                       >> ${tarbitratord_service_config}"
+    ${csudo}bash -c "echo 'StandardOutput=null'                     >> ${tarbitratord_service_config}"
+    ${csudo}bash -c "echo 'Restart=always'                          >> ${tarbitratord_service_config}"
+    ${csudo}bash -c "echo 'StartLimitBurst=3'                       >> ${tarbitratord_service_config}"
+    ${csudo}bash -c "echo 'StartLimitInterval=60s'                  >> ${tarbitratord_service_config}"
+    ${csudo}bash -c "echo                                           >> ${tarbitratord_service_config}"
+    ${csudo}bash -c "echo '[Install]'                               >> ${tarbitratord_service_config}"
+    ${csudo}bash -c "echo 'WantedBy=multi-user.target'              >> ${tarbitratord_service_config}"
+    ${csudo}systemctl enable tarbitratord
 }
 
 function install_service() {
@@ -287,9 +287,9 @@ function update_PowerDB() {
     # Stop the service if running
     if pidof tarbitrator &> /dev/null; then
         if ((${service_mod}==0)); then
-            ${csudo} systemctl stop tarbitratord || :
+            ${csudo}systemctl stop tarbitratord || :
         elif ((${service_mod}==1)); then
-            ${csudo} service tarbitratord stop || :
+            ${csudo}service tarbitratord stop || :
         else
             kill_tarbitrator
         fi
@@ -304,9 +304,9 @@ function update_PowerDB() {
 
     echo
     if ((${service_mod}==0)); then
-        echo -e "${GREEN_DARK}To start arbitrator     ${NC}: ${csudo} systemctl start tarbitratord${NC}"
+        echo -e "${GREEN_DARK}To start arbitrator     ${NC}: ${csudo}systemctl start tarbitratord${NC}"
     elif ((${service_mod}==1)); then
-        echo -e "${GREEN_DARK}To start arbitrator     ${NC}: ${csudo} service tarbitratord start${NC}"
+        echo -e "${GREEN_DARK}To start arbitrator     ${NC}: ${csudo}service tarbitratord start${NC}"
     else
         echo -e "${GREEN_DARK}To start arbitrator     ${NC}: ./tarbitrator${NC}"
     fi
@@ -326,9 +326,9 @@ function install_PowerDB() {
 
     echo
     if ((${service_mod}==0)); then
-        echo -e "${GREEN_DARK}To start arbitrator     ${NC}: ${csudo} systemctl start tarbitratord${NC}"
+        echo -e "${GREEN_DARK}To start arbitrator     ${NC}: ${csudo}systemctl start tarbitratord${NC}"
     elif ((${service_mod}==1)); then
-        echo -e "${GREEN_DARK}To start arbitrator     ${NC}: ${csudo} service tarbitratord start${NC}"
+        echo -e "${GREEN_DARK}To start arbitrator     ${NC}: ${csudo}service tarbitratord start${NC}"
     else
         echo -e "${GREEN_DARK}To start arbitrator     ${NC}: tarbitrator${NC}"
     fi

packaging/tools/install_arbi_pro.sh

@@ -29,7 +29,7 @@ NC='\033[0m'
 
 csudo=""
 if command -v sudo > /dev/null; then
-    csudo="sudo"
+    csudo="sudo "
 fi
 
 update_flag=0
@@ -91,61 +91,61 @@ fi
 function kill_tarbitrator() {
   pid=$(ps -ef | grep "tarbitrator" | grep -v "grep" | awk '{print $2}')
   if [ -n "$pid" ]; then
-    ${csudo} kill -9 $pid   || :
+    ${csudo}kill -9 $pid   || :
   fi
 }
 
 function install_main_path() {
     #create install main dir and all sub dir
-    ${csudo} rm -rf ${install_main_dir}    || :
-    ${csudo} mkdir -p ${install_main_dir}
-    ${csudo} mkdir -p ${install_main_dir}/bin  
-    #${csudo} mkdir -p ${install_main_dir}/include
-    ${csudo} mkdir -p ${install_main_dir}/init.d
+    ${csudo}rm -rf ${install_main_dir}    || :
+    ${csudo}mkdir -p ${install_main_dir}
+    ${csudo}mkdir -p ${install_main_dir}/bin  
+    #${csudo}mkdir -p ${install_main_dir}/include
+    ${csudo}mkdir -p ${install_main_dir}/init.d
 }
 
 function install_bin() {
     # Remove links
-    ${csudo} rm -f ${bin_link_dir}/rmtarbitrator   || :
-    ${csudo} rm -f ${bin_link_dir}/tarbitrator     || :
-    ${csudo} cp -r ${script_dir}/bin/* ${install_main_dir}/bin && ${csudo} chmod 0555 ${install_main_dir}/bin/*
+    ${csudo}rm -f ${bin_link_dir}/rmtarbitrator   || :
+    ${csudo}rm -f ${bin_link_dir}/tarbitrator     || :
+    ${csudo}cp -r ${script_dir}/bin/* ${install_main_dir}/bin && ${csudo}chmod 0555 ${install_main_dir}/bin/*
 
     #Make link
-    [ -x ${install_main_dir}/bin/remove_arbi_prodb.sh ] && ${csudo} ln -s ${install_main_dir}/bin/remove_arbi_prodb.sh ${bin_link_dir}/rmtarbitrator  || :
-    [ -x ${install_main_dir}/bin/tarbitrator ] && ${csudo} ln -s ${install_main_dir}/bin/tarbitrator ${bin_link_dir}/tarbitrator || :
+    [ -x ${install_main_dir}/bin/remove_arbi_prodb.sh ] && ${csudo}ln -s ${install_main_dir}/bin/remove_arbi_prodb.sh ${bin_link_dir}/rmtarbitrator  || :
+    [ -x ${install_main_dir}/bin/tarbitrator ] && ${csudo}ln -s ${install_main_dir}/bin/tarbitrator ${bin_link_dir}/tarbitrator || :
 }
 
 function install_header() {
-    ${csudo} rm -f ${inc_link_dir}/taos.h ${inc_link_dir}/taosdef.h ${inc_link_dir}/taoserror.h    || :
-    ${csudo} cp -f ${script_dir}/inc/* ${install_main_dir}/include && ${csudo} chmod 644 ${install_main_dir}/include/*    
-    ${csudo} ln -s ${install_main_dir}/include/taos.h ${inc_link_dir}/taos.h
-    ${csudo} ln -s ${install_main_dir}/include/taosdef.h ${inc_link_dir}/taosdef.h
-    ${csudo} ln -s ${install_main_dir}/include/taoserror.h ${inc_link_dir}/taoserror.h
+    ${csudo}rm -f ${inc_link_dir}/taos.h ${inc_link_dir}/taosdef.h ${inc_link_dir}/taoserror.h    || :
+    ${csudo}cp -f ${script_dir}/inc/* ${install_main_dir}/include && ${csudo}chmod 644 ${install_main_dir}/include/*    
+    ${csudo}ln -s ${install_main_dir}/include/taos.h ${inc_link_dir}/taos.h
+    ${csudo}ln -s ${install_main_dir}/include/taosdef.h ${inc_link_dir}/taosdef.h
+    ${csudo}ln -s ${install_main_dir}/include/taoserror.h ${inc_link_dir}/taoserror.h
 }
 
 function clean_service_on_sysvinit() {
     if pidof tarbitrator &> /dev/null; then
-        ${csudo} service tarbitratord stop || :
+        ${csudo}service tarbitratord stop || :
     fi
 
     if ((${initd_mod}==1)); then
       if [ -e ${service_config_dir}/tarbitratord ]; then 
-        ${csudo} chkconfig --del tarbitratord || :
+        ${csudo}chkconfig --del tarbitratord || :
       fi
     elif ((${initd_mod}==2)); then
       if [ -e ${service_config_dir}/tarbitratord ]; then
-        ${csudo} insserv -r tarbitratord || :
+        ${csudo}insserv -r tarbitratord || :
       fi
     elif ((${initd_mod}==3)); then
       if [ -e ${service_config_dir}/tarbitratord ]; then
-        ${csudo} update-rc.d -f tarbitratord remove || :
+        ${csudo}update-rc.d -f tarbitratord remove || :
       fi
     fi    
 
-    ${csudo} rm -f ${service_config_dir}/tarbitratord || :
+    ${csudo}rm -f ${service_config_dir}/tarbitratord || :
     
     if $(which init &> /dev/null); then
-        ${csudo} init q || :
+        ${csudo}init q || :
     fi
 }
 
@@ -156,21 +156,21 @@ function install_service_on_sysvinit() {
     # Install prodbs service
 
     if ((${os_type}==1)); then
-        ${csudo} cp -f ${script_dir}/init.d/tarbitratord.deb ${install_main_dir}/init.d/tarbitratord
-        ${csudo} cp    ${script_dir}/init.d/tarbitratord.deb ${service_config_dir}/tarbitratord && ${csudo} chmod a+x ${service_config_dir}/tarbitratord
+        ${csudo}cp -f ${script_dir}/init.d/tarbitratord.deb ${install_main_dir}/init.d/tarbitratord
+        ${csudo}cp    ${script_dir}/init.d/tarbitratord.deb ${service_config_dir}/tarbitratord && ${csudo}chmod a+x ${service_config_dir}/tarbitratord
     elif ((${os_type}==2)); then
-        ${csudo} cp -f ${script_dir}/init.d/tarbitratord.rpm ${install_main_dir}/init.d/tarbitratord
-        ${csudo} cp    ${script_dir}/init.d/tarbitratord.rpm ${service_config_dir}/tarbitratord && ${csudo} chmod a+x ${service_config_dir}/tarbitratord
+        ${csudo}cp -f ${script_dir}/init.d/tarbitratord.rpm ${install_main_dir}/init.d/tarbitratord
+        ${csudo}cp    ${script_dir}/init.d/tarbitratord.rpm ${service_config_dir}/tarbitratord && ${csudo}chmod a+x ${service_config_dir}/tarbitratord
     fi
     
     if ((${initd_mod}==1)); then
-        ${csudo} chkconfig --add tarbitratord || :
-        ${csudo} chkconfig --level 2345 tarbitratord on || :
+        ${csudo}chkconfig --add tarbitratord || :
+        ${csudo}chkconfig --level 2345 tarbitratord on || :
     elif ((${initd_mod}==2)); then
-        ${csudo} insserv tarbitratord || :
-        ${csudo} insserv -d tarbitratord || :
+        ${csudo}insserv tarbitratord || :
+        ${csudo}insserv -d tarbitratord || :
     elif ((${initd_mod}==3)); then
-        ${csudo} update-rc.d tarbitratord defaults || :
+        ${csudo}update-rc.d tarbitratord defaults || :
     fi
 }
 
@@ -178,11 +178,11 @@ function clean_service_on_systemd() {
   tarbitratord_service_config="${service_config_dir}/tarbitratord.service"
   if systemctl is-active --quiet tarbitratord; then
       echo "tarbitrator is running, stopping it..."
-      ${csudo} systemctl stop tarbitratord &> /dev/null || echo &> /dev/null
+      ${csudo}systemctl stop tarbitratord &> /dev/null || echo &> /dev/null
   fi
-  ${csudo} systemctl disable tarbitratord &> /dev/null || echo &> /dev/null
+  ${csudo}systemctl disable tarbitratord &> /dev/null || echo &> /dev/null
 
-  ${csudo} rm -f ${tarbitratord_service_config}
+  ${csudo}rm -f ${tarbitratord_service_config}
 }
 
 function install_service_on_systemd() {
@@ -190,27 +190,27 @@ function install_service_on_systemd() {
 
     tarbitratord_service_config="${service_config_dir}/tarbitratord.service"
 
-    ${csudo} bash -c "echo '[Unit]'                                  >> ${tarbitratord_service_config}"
-    ${csudo} bash -c "echo 'Description=ProDB arbitrator service' >> ${tarbitratord_service_config}"
-    ${csudo} bash -c "echo 'After=network-online.target'             >> ${tarbitratord_service_config}"
-    ${csudo} bash -c "echo 'Wants=network-online.target'             >> ${tarbitratord_service_config}"
-    ${csudo} bash -c "echo                                           >> ${tarbitratord_service_config}"
-    ${csudo} bash -c "echo '[Service]'                               >> ${tarbitratord_service_config}"
-    ${csudo} bash -c "echo 'Type=simple'                             >> ${tarbitratord_service_config}"
-    ${csudo} bash -c "echo 'ExecStart=/usr/bin/tarbitrator'          >> ${tarbitratord_service_config}"
-    ${csudo} bash -c "echo 'TimeoutStopSec=1000000s'                 >> ${tarbitratord_service_config}"
-    ${csudo} bash -c "echo 'LimitNOFILE=infinity'                    >> ${tarbitratord_service_config}"
-    ${csudo} bash -c "echo 'LimitNPROC=infinity'                     >> ${tarbitratord_service_config}"
-    ${csudo} bash -c "echo 'LimitCORE=infinity'                      >> ${tarbitratord_service_config}"
-    ${csudo} bash -c "echo 'TimeoutStartSec=0'                       >> ${tarbitratord_service_config}"
-    ${csudo} bash -c "echo 'StandardOutput=null'                     >> ${tarbitratord_service_config}"
-    ${csudo} bash -c "echo 'Restart=always'                          >> ${tarbitratord_service_config}"
-    ${csudo} bash -c "echo 'StartLimitBurst=3'                       >> ${tarbitratord_service_config}"
-    ${csudo} bash -c "echo 'StartLimitInterval=60s'                  >> ${tarbitratord_service_config}"
-    ${csudo} bash -c "echo                                           >> ${tarbitratord_service_config}"
-    ${csudo} bash -c "echo '[Install]'                               >> ${tarbitratord_service_config}"
-    ${csudo} bash -c "echo 'WantedBy=multi-user.target'              >> ${tarbitratord_service_config}"
-    ${csudo} systemctl enable tarbitratord
+    ${csudo}bash -c "echo '[Unit]'                                  >> ${tarbitratord_service_config}"
+    ${csudo}bash -c "echo 'Description=ProDB arbitrator service' >> ${tarbitratord_service_config}"
+    ${csudo}bash -c "echo 'After=network-online.target'             >> ${tarbitratord_service_config}"
+    ${csudo}bash -c "echo 'Wants=network-online.target'             >> ${tarbitratord_service_config}"
+    ${csudo}bash -c "echo                                           >> ${tarbitratord_service_config}"
+    ${csudo}bash -c "echo '[Service]'                               >> ${tarbitratord_service_config}"
+    ${csudo}bash -c "echo 'Type=simple'                             >> ${tarbitratord_service_config}"
+    ${csudo}bash -c "echo 'ExecStart=/usr/bin/tarbitrator'          >> ${tarbitratord_service_config}"
+    ${csudo}bash -c "echo 'TimeoutStopSec=1000000s'                 >> ${tarbitratord_service_config}"
+    ${csudo}bash -c "echo 'LimitNOFILE=infinity'                    >> ${tarbitratord_service_config}"
+    ${csudo}bash -c "echo 'LimitNPROC=infinity'                     >> ${tarbitratord_service_config}"
+    ${csudo}bash -c "echo 'LimitCORE=infinity'                      >> ${tarbitratord_service_config}"
+    ${csudo}bash -c "echo 'TimeoutStartSec=0'                       >> ${tarbitratord_service_config}"
+    ${csudo}bash -c "echo 'StandardOutput=null'                     >> ${tarbitratord_service_config}"
+    ${csudo}bash -c "echo 'Restart=always'                          >> ${tarbitratord_service_config}"
+    ${csudo}bash -c "echo 'StartLimitBurst=3'                       >> ${tarbitratord_service_config}"
+    ${csudo}bash -c "echo 'StartLimitInterval=60s'                  >> ${tarbitratord_service_config}"
+    ${csudo}bash -c "echo                                           >> ${tarbitratord_service_config}"
+    ${csudo}bash -c "echo '[Install]'                               >> ${tarbitratord_service_config}"
+    ${csudo}bash -c "echo 'WantedBy=multi-user.target'              >> ${tarbitratord_service_config}"
+    ${csudo}systemctl enable tarbitratord
 }
 
 function install_service() {
@@ -229,9 +229,9 @@ function update_prodb() {
     # Stop the service if running
     if pidof tarbitrator &> /dev/null; then
         if ((${service_mod}==0)); then
-            ${csudo} systemctl stop tarbitratord || :
+            ${csudo}systemctl stop tarbitratord || :
         elif ((${service_mod}==1)); then
-            ${csudo} service tarbitratord stop || :
+            ${csudo}service tarbitratord stop || :
         else
             kill_tarbitrator
         fi
@@ -245,9 +245,9 @@ function update_prodb() {
 		
     echo
     if ((${service_mod}==0)); then
-        echo -e "${GREEN_DARK}To start arbitrator     ${NC}: ${csudo} systemctl start tarbitratord${NC}"
+        echo -e "${GREEN_DARK}To start arbitrator     ${NC}: ${csudo}systemctl start tarbitratord${NC}"
     elif ((${service_mod}==1)); then
-        echo -e "${GREEN_DARK}To start arbitrator     ${NC}: ${csudo} service tarbitratord start${NC}"
+        echo -e "${GREEN_DARK}To start arbitrator     ${NC}: ${csudo}service tarbitratord start${NC}"
     else
         echo -e "${GREEN_DARK}To start arbitrator     ${NC}: ./tarbitrator${NC}"
     fi                
@@ -265,9 +265,9 @@ function install_prodb() {
     install_service
     echo
     if ((${service_mod}==0)); then
-        echo -e "${GREEN_DARK}To start arbitrator     ${NC}: ${csudo} systemctl start tarbitratord${NC}"
+        echo -e "${GREEN_DARK}To start arbitrator     ${NC}: ${csudo}systemctl start tarbitratord${NC}"
     elif ((${service_mod}==1)); then
-        echo -e "${GREEN_DARK}To start arbitrator     ${NC}: ${csudo} service tarbitratord start${NC}"
+        echo -e "${GREEN_DARK}To start arbitrator     ${NC}: ${csudo}service tarbitratord start${NC}"
     else
         echo -e "${GREEN_DARK}To start arbitrator     ${NC}: tarbitrator${NC}"
     fi

packaging/tools/install_arbi_tq.sh

@@ -29,7 +29,7 @@ NC='\033[0m'
 
 csudo=""
 if command -v sudo > /dev/null; then
-    csudo="sudo"
+    csudo="sudo "
 fi
 
 update_flag=0
@@ -91,61 +91,61 @@ fi
 function kill_tarbitrator() {
   pid=$(ps -ef | grep "tarbitrator" | grep -v "grep" | awk '{print $2}')
   if [ -n "$pid" ]; then
-    ${csudo} kill -9 $pid   || :
+    ${csudo}kill -9 $pid   || :
   fi
 }
 
 function install_main_path() {
     #create install main dir and all sub dir
-    ${csudo} rm -rf ${install_main_dir}    || :
-    ${csudo} mkdir -p ${install_main_dir}
-    ${csudo} mkdir -p ${install_main_dir}/bin  
-    #${csudo} mkdir -p ${install_main_dir}/include
-    ${csudo} mkdir -p ${install_main_dir}/init.d
+    ${csudo}rm -rf ${install_main_dir}    || :
+    ${csudo}mkdir -p ${install_main_dir}
+    ${csudo}mkdir -p ${install_main_dir}/bin  
+    #${csudo}mkdir -p ${install_main_dir}/include
+    ${csudo}mkdir -p ${install_main_dir}/init.d
 }
 
 function install_bin() {
     # Remove links
-    ${csudo} rm -f ${bin_link_dir}/rmtarbitrator   || :
-    ${csudo} rm -f ${bin_link_dir}/tarbitrator     || :
-    ${csudo} cp -r ${script_dir}/bin/* ${install_main_dir}/bin && ${csudo} chmod 0555 ${install_main_dir}/bin/*
+    ${csudo}rm -f ${bin_link_dir}/rmtarbitrator   || :
+    ${csudo}rm -f ${bin_link_dir}/tarbitrator     || :
+    ${csudo}cp -r ${script_dir}/bin/* ${install_main_dir}/bin && ${csudo}chmod 0555 ${install_main_dir}/bin/*
 
     #Make link
-    [ -x ${install_main_dir}/bin/remove_arbi_tq.sh ] && ${csudo} ln -s ${install_main_dir}/bin/remove_arbi_tq.sh ${bin_link_dir}/rmtarbitrator  || :
-    [ -x ${install_main_dir}/bin/tarbitrator ] && ${csudo} ln -s ${install_main_dir}/bin/tarbitrator ${bin_link_dir}/tarbitrator || :
+    [ -x ${install_main_dir}/bin/remove_arbi_tq.sh ] && ${csudo}ln -s ${install_main_dir}/bin/remove_arbi_tq.sh ${bin_link_dir}/rmtarbitrator  || :
+    [ -x ${install_main_dir}/bin/tarbitrator ] && ${csudo}ln -s ${install_main_dir}/bin/tarbitrator ${bin_link_dir}/tarbitrator || :
 }
 
 function install_header() {
-    ${csudo} rm -f ${inc_link_dir}/taos.h ${inc_link_dir}/taosdef.h ${inc_link_dir}/taoserror.h    || :
-    ${csudo} cp -f ${script_dir}/inc/* ${install_main_dir}/include && ${csudo} chmod 644 ${install_main_dir}/include/*
-    ${csudo} ln -s ${install_main_dir}/include/taos.h ${inc_link_dir}/taos.h
-    ${csudo} ln -s ${install_main_dir}/include/taosdef.h ${inc_link_dir}/taosdef.h
-    ${csudo} ln -s ${install_main_dir}/include/taoserror.h ${inc_link_dir}/taoserror.h
+    ${csudo}rm -f ${inc_link_dir}/taos.h ${inc_link_dir}/taosdef.h ${inc_link_dir}/taoserror.h    || :
+    ${csudo}cp -f ${script_dir}/inc/* ${install_main_dir}/include && ${csudo}chmod 644 ${install_main_dir}/include/*
+    ${csudo}ln -s ${install_main_dir}/include/taos.h ${inc_link_dir}/taos.h
+    ${csudo}ln -s ${install_main_dir}/include/taosdef.h ${inc_link_dir}/taosdef.h
+    ${csudo}ln -s ${install_main_dir}/include/taoserror.h ${inc_link_dir}/taoserror.h
 }
 
 function clean_service_on_sysvinit() {
     if pidof tarbitrator &> /dev/null; then
-        ${csudo} service tarbitratord stop || :
+        ${csudo}service tarbitratord stop || :
     fi
 
     if ((${initd_mod}==1)); then
       if [ -e ${service_config_dir}/tarbitratord ]; then 
-        ${csudo} chkconfig --del tarbitratord || :
+        ${csudo}chkconfig --del tarbitratord || :
       fi
     elif ((${initd_mod}==2)); then
       if [ -e ${service_config_dir}/tarbitratord ]; then
-        ${csudo} insserv -r tarbitratord || :
+        ${csudo}insserv -r tarbitratord || :
       fi
     elif ((${initd_mod}==3)); then
       if [ -e ${service_config_dir}/tarbitratord ]; then
-        ${csudo} update-rc.d -f tarbitratord remove || :
+        ${csudo}update-rc.d -f tarbitratord remove || :
       fi
     fi    
 
-    ${csudo} rm -f ${service_config_dir}/tarbitratord || :
+    ${csudo}rm -f ${service_config_dir}/tarbitratord || :
     
     if $(which init &> /dev/null); then
-        ${csudo} init q || :
+        ${csudo}init q || :
     fi
 }
 
@@ -156,24 +156,24 @@ function install_service_on_sysvinit() {
     # Install tqd service
 
     if ((${os_type}==1)); then
-        ${csudo} cp -f ${script_dir}/init.d/tarbitratord.deb ${install_main_dir}/init.d/tarbitratord
-        ${csudo} cp    ${script_dir}/init.d/tarbitratord.deb ${service_config_dir}/tarbitratord && ${csudo} chmod a+x ${service_config_dir}/tarbitratord
+        ${csudo}cp -f ${script_dir}/init.d/tarbitratord.deb ${install_main_dir}/init.d/tarbitratord
+        ${csudo}cp    ${script_dir}/init.d/tarbitratord.deb ${service_config_dir}/tarbitratord && ${csudo}chmod a+x ${service_config_dir}/tarbitratord
     elif ((${os_type}==2)); then
-        ${csudo} cp -f ${script_dir}/init.d/tarbitratord.rpm ${install_main_dir}/init.d/tarbitratord
-        ${csudo} cp    ${script_dir}/init.d/tarbitratord.rpm ${service_config_dir}/tarbitratord && ${csudo} chmod a+x ${service_config_dir}/tarbitratord
+        ${csudo}cp -f ${script_dir}/init.d/tarbitratord.rpm ${install_main_dir}/init.d/tarbitratord
+        ${csudo}cp    ${script_dir}/init.d/tarbitratord.rpm ${service_config_dir}/tarbitratord && ${csudo}chmod a+x ${service_config_dir}/tarbitratord
     fi
     
     #restart_config_str="tq:2345:respawn:${service_config_dir}/tqd start"
-    #${csudo} grep -q -F "$restart_config_str" /etc/inittab || ${csudo} bash -c "echo '${restart_config_str}' >> /etc/inittab"
+    #${csudo}grep -q -F "$restart_config_str" /etc/inittab || ${csudo}bash -c "echo '${restart_config_str}' >> /etc/inittab"
     
     if ((${initd_mod}==1)); then
-        ${csudo} chkconfig --add tarbitratord || :
-        ${csudo} chkconfig --level 2345 tarbitratord on || :
+        ${csudo}chkconfig --add tarbitratord || :
+        ${csudo}chkconfig --level 2345 tarbitratord on || :
     elif ((${initd_mod}==2)); then
-        ${csudo} insserv tarbitratord || :
-        ${csudo} insserv -d tarbitratord || :
+        ${csudo}insserv tarbitratord || :
+        ${csudo}insserv -d tarbitratord || :
     elif ((${initd_mod}==3)); then
-        ${csudo} update-rc.d tarbitratord defaults || :
+        ${csudo}update-rc.d tarbitratord defaults || :
     fi
 }
 
@@ -181,11 +181,11 @@ function clean_service_on_systemd() {
   tarbitratord_service_config="${service_config_dir}/tarbitratord.service"
   if systemctl is-active --quiet tarbitratord; then
       echo "tarbitrator is running, stopping it..."
-      ${csudo} systemctl stop tarbitratord &> /dev/null || echo &> /dev/null
+      ${csudo}systemctl stop tarbitratord &> /dev/null || echo &> /dev/null
   fi
-  ${csudo} systemctl disable tarbitratord &> /dev/null || echo &> /dev/null
+  ${csudo}systemctl disable tarbitratord &> /dev/null || echo &> /dev/null
 
-  ${csudo} rm -f ${tarbitratord_service_config}
+  ${csudo}rm -f ${tarbitratord_service_config}
 }
 
 # tq:2345:respawn:/etc/init.d/tarbitratord start
@@ -195,27 +195,27 @@ function install_service_on_systemd() {
 
     tarbitratord_service_config="${service_config_dir}/tarbitratord.service"
 
-    ${csudo} bash -c "echo '[Unit]'                                  >> ${tarbitratord_service_config}"
-    ${csudo} bash -c "echo 'Description=TQ arbitrator service' >> ${tarbitratord_service_config}"
-    ${csudo} bash -c "echo 'After=network-online.target'             >> ${tarbitratord_service_config}"
-    ${csudo} bash -c "echo 'Wants=network-online.target'             >> ${tarbitratord_service_config}"
-    ${csudo} bash -c "echo                                           >> ${tarbitratord_service_config}"
-    ${csudo} bash -c "echo '[Service]'                               >> ${tarbitratord_service_config}"
-    ${csudo} bash -c "echo 'Type=simple'                             >> ${tarbitratord_service_config}"
-    ${csudo} bash -c "echo 'ExecStart=/usr/bin/tarbitrator'          >> ${tarbitratord_service_config}"
-    ${csudo} bash -c "echo 'TimeoutStopSec=1000000s'                 >> ${tarbitratord_service_config}"
-    ${csudo} bash -c "echo 'LimitNOFILE=infinity'                    >> ${tarbitratord_service_config}"
-    ${csudo} bash -c "echo 'LimitNPROC=infinity'                     >> ${tarbitratord_service_config}"
-    ${csudo} bash -c "echo 'LimitCORE=infinity'                      >> ${tarbitratord_service_config}"
-    ${csudo} bash -c "echo 'TimeoutStartSec=0'                       >> ${tarbitratord_service_config}"
-    ${csudo} bash -c "echo 'StandardOutput=null'                     >> ${tarbitratord_service_config}"
-    ${csudo} bash -c "echo 'Restart=always'                          >> ${tarbitratord_service_config}"
-    ${csudo} bash -c "echo 'StartLimitBurst=3'                       >> ${tarbitratord_service_config}"
-    ${csudo} bash -c "echo 'StartLimitInterval=60s'                  >> ${tarbitratord_service_config}"
-    ${csudo} bash -c "echo                                           >> ${tarbitratord_service_config}"
-    ${csudo} bash -c "echo '[Install]'                               >> ${tarbitratord_service_config}"
-    ${csudo} bash -c "echo 'WantedBy=multi-user.target'              >> ${tarbitratord_service_config}"
-    ${csudo} systemctl enable tarbitratord
+    ${csudo}bash -c "echo '[Unit]'                                  >> ${tarbitratord_service_config}"
+    ${csudo}bash -c "echo 'Description=TQ arbitrator service' >> ${tarbitratord_service_config}"
+    ${csudo}bash -c "echo 'After=network-online.target'             >> ${tarbitratord_service_config}"
+    ${csudo}bash -c "echo 'Wants=network-online.target'             >> ${tarbitratord_service_config}"
+    ${csudo}bash -c "echo                                           >> ${tarbitratord_service_config}"
+    ${csudo}bash -c "echo '[Service]'                               >> ${tarbitratord_service_config}"
+    ${csudo}bash -c "echo 'Type=simple'                             >> ${tarbitratord_service_config}"
+    ${csudo}bash -c "echo 'ExecStart=/usr/bin/tarbitrator'          >> ${tarbitratord_service_config}"
+    ${csudo}bash -c "echo 'TimeoutStopSec=1000000s'                 >> ${tarbitratord_service_config}"
+    ${csudo}bash -c "echo 'LimitNOFILE=infinity'                    >> ${tarbitratord_service_config}"
+    ${csudo}bash -c "echo 'LimitNPROC=infinity'                     >> ${tarbitratord_service_config}"
+    ${csudo}bash -c "echo 'LimitCORE=infinity'                      >> ${tarbitratord_service_config}"
+    ${csudo}bash -c "echo 'TimeoutStartSec=0'                       >> ${tarbitratord_service_config}"
+    ${csudo}bash -c "echo 'StandardOutput=null'                     >> ${tarbitratord_service_config}"
+    ${csudo}bash -c "echo 'Restart=always'                          >> ${tarbitratord_service_config}"
+    ${csudo}bash -c "echo 'StartLimitBurst=3'                       >> ${tarbitratord_service_config}"
+    ${csudo}bash -c "echo 'StartLimitInterval=60s'                  >> ${tarbitratord_service_config}"
+    ${csudo}bash -c "echo                                           >> ${tarbitratord_service_config}"
+    ${csudo}bash -c "echo '[Install]'                               >> ${tarbitratord_service_config}"
+    ${csudo}bash -c "echo 'WantedBy=multi-user.target'              >> ${tarbitratord_service_config}"
+    ${csudo}systemctl enable tarbitratord
 }
 
 function install_service() {
@@ -234,9 +234,9 @@ function update_tq() {
     # Stop the service if running
     if pidof tarbitrator &> /dev/null; then
         if ((${service_mod}==0)); then
-            ${csudo} systemctl stop tarbitratord || :
+            ${csudo}systemctl stop tarbitratord || :
         elif ((${service_mod}==1)); then
-            ${csudo} service tarbitratord stop || :
+            ${csudo}service tarbitratord stop || :
         else
             kill_tarbitrator
         fi
@@ -250,9 +250,9 @@ function update_tq() {
 		
     echo
     if ((${service_mod}==0)); then
-        echo -e "${GREEN_DARK}To start arbitrator     ${NC}: ${csudo} systemctl start tarbitratord${NC}"
+        echo -e "${GREEN_DARK}To start arbitrator     ${NC}: ${csudo}systemctl start tarbitratord${NC}"
     elif ((${service_mod}==1)); then
-        echo -e "${GREEN_DARK}To start arbitrator     ${NC}: ${csudo} service tarbitratord start${NC}"
+        echo -e "${GREEN_DARK}To start arbitrator     ${NC}: ${csudo}service tarbitratord start${NC}"
     else
         echo -e "${GREEN_DARK}To start arbitrator     ${NC}: ./tarbitrator${NC}"
     fi                
@@ -270,9 +270,9 @@ function install_tq() {
     install_service
     echo
     if ((${service_mod}==0)); then
-        echo -e "${GREEN_DARK}To start arbitrator     ${NC}: ${csudo} systemctl start tarbitratord${NC}"
+        echo -e "${GREEN_DARK}To start arbitrator     ${NC}: ${csudo}systemctl start tarbitratord${NC}"
     elif ((${service_mod}==1)); then
-        echo -e "${GREEN_DARK}To start arbitrator     ${NC}: ${csudo} service tarbitratord start${NC}"
+        echo -e "${GREEN_DARK}To start arbitrator     ${NC}: ${csudo}service tarbitratord start${NC}"
     else
         echo -e "${GREEN_DARK}To start arbitrator     ${NC}: tarbitrator${NC}"
     fi

packaging/tools/install_client.sh

@@ -57,7 +57,7 @@ NC='\033[0m'
 
 csudo=""
 if command -v sudo > /dev/null; then
-    csudo="sudo"
+    csudo="sudo "
 fi
 
 update_flag=0
@@ -65,40 +65,40 @@ update_flag=0
 function kill_client() {
   pid=$(ps -ef | grep "taos" | grep -v "grep" | awk '{print $2}')
   if [ -n "$pid" ]; then
-    ${csudo} kill -9 $pid   || :
+    ${csudo}kill -9 $pid   || :
   fi
 }
 
 function install_main_path() {
     #create install main dir and all sub dir
-    ${csudo} rm -rf ${install_main_dir}    || :
-    ${csudo} mkdir -p ${install_main_dir}
-    ${csudo} mkdir -p ${install_main_dir}/cfg
-    ${csudo} mkdir -p ${install_main_dir}/bin
-    ${csudo} mkdir -p ${install_main_dir}/connector
-    ${csudo} mkdir -p ${install_main_dir}/driver
-    ${csudo} mkdir -p ${install_main_dir}/examples
-    ${csudo} mkdir -p ${install_main_dir}/include
+    ${csudo}rm -rf ${install_main_dir}    || :
+    ${csudo}mkdir -p ${install_main_dir}
+    ${csudo}mkdir -p ${install_main_dir}/cfg
+    ${csudo}mkdir -p ${install_main_dir}/bin
+    ${csudo}mkdir -p ${install_main_dir}/connector
+    ${csudo}mkdir -p ${install_main_dir}/driver
+    ${csudo}mkdir -p ${install_main_dir}/examples
+    ${csudo}mkdir -p ${install_main_dir}/include
 }
 
 function install_bin() {
   # Remove links
-  ${csudo} rm -f ${bin_link_dir}/taos         || :
+  ${csudo}rm -f ${bin_link_dir}/taos         || :
   if [ "$osType" != "Darwin" ]; then
-      ${csudo} rm -f ${bin_link_dir}/taosdemo || :
+      ${csudo}rm -f ${bin_link_dir}/taosdemo || :
   fi
-  ${csudo} rm -f ${bin_link_dir}/rmtaos       || :
-  ${csudo} rm -f ${bin_link_dir}/set_core     || :
+  ${csudo}rm -f ${bin_link_dir}/rmtaos       || :
+  ${csudo}rm -f ${bin_link_dir}/set_core     || :
 
-  ${csudo} cp -r ${script_dir}/bin/* ${install_main_dir}/bin && ${csudo} chmod 0555 ${install_main_dir}/bin/*
+  ${csudo}cp -r ${script_dir}/bin/* ${install_main_dir}/bin && ${csudo}chmod 0555 ${install_main_dir}/bin/*
 
   #Make link
-  [ -x ${install_main_dir}/bin/taos ] && ${csudo} ln -s ${install_main_dir}/bin/taos ${bin_link_dir}/taos                 || :
+  [ -x ${install_main_dir}/bin/taos ] && ${csudo}ln -s ${install_main_dir}/bin/taos ${bin_link_dir}/taos                 || :
   if [ "$osType" != "Darwin" ]; then
-      [ -x ${install_main_dir}/bin/taosdemo ] && ${csudo} ln -s ${install_main_dir}/bin/taosdemo ${bin_link_dir}/taosdemo || :
+      [ -x ${install_main_dir}/bin/taosdemo ] && ${csudo}ln -s ${install_main_dir}/bin/taosdemo ${bin_link_dir}/taosdemo || :
   fi
-  [ -x ${install_main_dir}/bin/remove_client.sh ] && ${csudo} ln -s ${install_main_dir}/bin/remove_client.sh ${bin_link_dir}/rmtaos || :
-  [ -x ${install_main_dir}/bin/set_core.sh ] && ${csudo} ln -s ${install_main_dir}/bin/set_core.sh ${bin_link_dir}/set_core || :
+  [ -x ${install_main_dir}/bin/remove_client.sh ] && ${csudo}ln -s ${install_main_dir}/bin/remove_client.sh ${bin_link_dir}/rmtaos || :
+  [ -x ${install_main_dir}/bin/set_core.sh ] && ${csudo}ln -s ${install_main_dir}/bin/set_core.sh ${bin_link_dir}/set_core || :
 }
 
 function clean_lib() {
@@ -108,87 +108,87 @@ function clean_lib() {
 
 function install_lib() {
     # Remove links
-    ${csudo} rm -f ${lib_link_dir}/libtaos.*         || :
-    ${csudo} rm -f ${lib64_link_dir}/libtaos.*       || :
-    #${csudo} rm -rf ${v15_java_app_dir}              || :
+    ${csudo}rm -f ${lib_link_dir}/libtaos.*         || :
+    ${csudo}rm -f ${lib64_link_dir}/libtaos.*       || :
+    #${csudo}rm -rf ${v15_java_app_dir}              || :
 
-    ${csudo} cp -rf ${script_dir}/driver/* ${install_main_dir}/driver && ${csudo} chmod 777 ${install_main_dir}/driver/*
+    ${csudo}cp -rf ${script_dir}/driver/* ${install_main_dir}/driver && ${csudo}chmod 777 ${install_main_dir}/driver/*
 
     if [ "$osType" != "Darwin" ]; then
-        ${csudo} ln -s ${install_main_dir}/driver/libtaos.* ${lib_link_dir}/libtaos.so.1
-        ${csudo} ln -s ${lib_link_dir}/libtaos.so.1 ${lib_link_dir}/libtaos.so
+        ${csudo}ln -s ${install_main_dir}/driver/libtaos.* ${lib_link_dir}/libtaos.so.1
+        ${csudo}ln -s ${lib_link_dir}/libtaos.so.1 ${lib_link_dir}/libtaos.so
 
         if [ -d "${lib64_link_dir}" ]; then
-            ${csudo} ln -s ${install_main_dir}/driver/libtaos.* ${lib64_link_dir}/libtaos.so.1       || :
-            ${csudo} ln -s ${lib64_link_dir}/libtaos.so.1 ${lib64_link_dir}/libtaos.so               || :
+            ${csudo}ln -s ${install_main_dir}/driver/libtaos.* ${lib64_link_dir}/libtaos.so.1       || :
+            ${csudo}ln -s ${lib64_link_dir}/libtaos.so.1 ${lib64_link_dir}/libtaos.so               || :
         fi
     else
-        ${csudo} ln -s ${install_main_dir}/driver/libtaos.* ${lib_link_dir}/libtaos.1.dylib
-        ${csudo} ln -s ${lib_link_dir}/libtaos.1.dylib ${lib_link_dir}/libtaos.dylib
+        ${csudo}ln -s ${install_main_dir}/driver/libtaos.* ${lib_link_dir}/libtaos.1.dylib
+        ${csudo}ln -s ${lib_link_dir}/libtaos.1.dylib ${lib_link_dir}/libtaos.dylib
     fi
 
     if [ "$osType" != "Darwin" ]; then
-        ${csudo} ldconfig
+        ${csudo}ldconfig
     else
-        ${csudo} update_dyld_shared_cache
+        ${csudo}update_dyld_shared_cache
     fi
 }
 
 function install_header() {
-    ${csudo} rm -f ${inc_link_dir}/taos.h ${inc_link_dir}/taosdef.h ${inc_link_dir}/taoserror.h    || :
-    ${csudo} cp -f ${script_dir}/inc/* ${install_main_dir}/include && ${csudo} chmod 644 ${install_main_dir}/include/*
-    ${csudo} ln -s ${install_main_dir}/include/taos.h ${inc_link_dir}/taos.h
-    ${csudo} ln -s ${install_main_dir}/include/taosdef.h ${inc_link_dir}/taosdef.h
-    ${csudo} ln -s ${install_main_dir}/include/taoserror.h ${inc_link_dir}/taoserror.h
+    ${csudo}rm -f ${inc_link_dir}/taos.h ${inc_link_dir}/taosdef.h ${inc_link_dir}/taoserror.h    || :
+    ${csudo}cp -f ${script_dir}/inc/* ${install_main_dir}/include && ${csudo}chmod 644 ${install_main_dir}/include/*
+    ${csudo}ln -s ${install_main_dir}/include/taos.h ${inc_link_dir}/taos.h
+    ${csudo}ln -s ${install_main_dir}/include/taosdef.h ${inc_link_dir}/taosdef.h
+    ${csudo}ln -s ${install_main_dir}/include/taoserror.h ${inc_link_dir}/taoserror.h
 }
 
 function install_jemalloc() {
     jemalloc_dir=${script_dir}/jemalloc
 
     if [ -d ${jemalloc_dir} ]; then
-        ${csudo} /usr/bin/install -c -d /usr/local/bin
+        ${csudo}/usr/bin/install -c -d /usr/local/bin
 
         if [ -f ${jemalloc_dir}/bin/jemalloc-config ]; then
-            ${csudo} /usr/bin/install -c -m 755 ${jemalloc_dir}/bin/jemalloc-config /usr/local/bin
+            ${csudo}/usr/bin/install -c -m 755 ${jemalloc_dir}/bin/jemalloc-config /usr/local/bin
         fi
         if [ -f ${jemalloc_dir}/bin/jemalloc.sh ]; then
-            ${csudo} /usr/bin/install -c -m 755 ${jemalloc_dir}/bin/jemalloc.sh /usr/local/bin
+            ${csudo}/usr/bin/install -c -m 755 ${jemalloc_dir}/bin/jemalloc.sh /usr/local/bin
         fi
         if [ -f ${jemalloc_dir}/bin/jeprof ]; then
-            ${csudo} /usr/bin/install -c -m 755 ${jemalloc_dir}/bin/jeprof /usr/local/bin
+            ${csudo}/usr/bin/install -c -m 755 ${jemalloc_dir}/bin/jeprof /usr/local/bin
         fi
         if [ -f ${jemalloc_dir}/include/jemalloc/jemalloc.h ]; then
-            ${csudo} /usr/bin/install -c -d /usr/local/include/jemalloc
-            ${csudo} /usr/bin/install -c -m 644 ${jemalloc_dir}/include/jemalloc/jemalloc.h /usr/local/include/jemalloc
+            ${csudo}/usr/bin/install -c -d /usr/local/include/jemalloc
+            ${csudo}/usr/bin/install -c -m 644 ${jemalloc_dir}/include/jemalloc/jemalloc.h /usr/local/include/jemalloc
         fi
         if [ -f ${jemalloc_dir}/lib/libjemalloc.so.2 ]; then
-            ${csudo} /usr/bin/install -c -d /usr/local/lib
-            ${csudo} /usr/bin/install -c -m 755 ${jemalloc_dir}/lib/libjemalloc.so.2 /usr/local/lib
-            ${csudo} ln -sf libjemalloc.so.2 /usr/local/lib/libjemalloc.so
-            ${csudo} /usr/bin/install -c -d /usr/local/lib
+            ${csudo}/usr/bin/install -c -d /usr/local/lib
+            ${csudo}/usr/bin/install -c -m 755 ${jemalloc_dir}/lib/libjemalloc.so.2 /usr/local/lib
+            ${csudo}ln -sf libjemalloc.so.2 /usr/local/lib/libjemalloc.so
+            ${csudo}/usr/bin/install -c -d /usr/local/lib
             if [ -f ${jemalloc_dir}/lib/libjemalloc.a ]; then
-                ${csudo} /usr/bin/install -c -m 755 ${jemalloc_dir}/lib/libjemalloc.a /usr/local/lib
+                ${csudo}/usr/bin/install -c -m 755 ${jemalloc_dir}/lib/libjemalloc.a /usr/local/lib
             fi
             if [ -f ${jemalloc_dir}/lib/libjemalloc_pic.a ]; then
-                ${csudo} /usr/bin/install -c -m 755 ${jemalloc_dir}/lib/libjemalloc_pic.a /usr/local/lib
+                ${csudo}/usr/bin/install -c -m 755 ${jemalloc_dir}/lib/libjemalloc_pic.a /usr/local/lib
             fi
             if [ -f ${jemalloc_dir}/lib/libjemalloc_pic.a ]; then
-                ${csudo} /usr/bin/install -c -d /usr/local/lib/pkgconfig
-                ${csudo} /usr/bin/install -c -m 644 ${jemalloc_dir}/lib/pkgconfig/jemalloc.pc /usr/local/lib/pkgconfig
+                ${csudo}/usr/bin/install -c -d /usr/local/lib/pkgconfig
+                ${csudo}/usr/bin/install -c -m 644 ${jemalloc_dir}/lib/pkgconfig/jemalloc.pc /usr/local/lib/pkgconfig
             fi
         fi
         if [ -f ${jemalloc_dir}/share/doc/jemalloc/jemalloc.html ]; then
-            ${csudo} /usr/bin/install -c -d /usr/local/share/doc/jemalloc
-            ${csudo} /usr/bin/install -c -m 644 ${jemalloc_dir}/share/doc/jemalloc/jemalloc.html /usr/local/share/doc/jemalloc
+            ${csudo}/usr/bin/install -c -d /usr/local/share/doc/jemalloc
+            ${csudo}/usr/bin/install -c -m 644 ${jemalloc_dir}/share/doc/jemalloc/jemalloc.html /usr/local/share/doc/jemalloc
         fi
         if [ -f ${jemalloc_dir}/share/man/man3/jemalloc.3 ]; then
-            ${csudo} /usr/bin/install -c -d /usr/local/share/man/man3
-            ${csudo} /usr/bin/install -c -m 644 ${jemalloc_dir}/share/man/man3/jemalloc.3 /usr/local/share/man/man3
+            ${csudo}/usr/bin/install -c -d /usr/local/share/man/man3
+            ${csudo}/usr/bin/install -c -m 644 ${jemalloc_dir}/share/man/man3/jemalloc.3 /usr/local/share/man/man3
         fi
 
         if [ -d /etc/ld.so.conf.d ]; then
-            echo "/usr/local/lib" | ${csudo} tee /etc/ld.so.conf.d/jemalloc.conf > /dev/null || echo -e "failed to write /etc/ld.so.conf.d/jemalloc.conf"
-            ${csudo} ldconfig
+            echo "/usr/local/lib" | ${csudo}tee /etc/ld.so.conf.d/jemalloc.conf > /dev/null || echo -e "failed to write /etc/ld.so.conf.d/jemalloc.conf"
+            ${csudo}ldconfig
         else
             echo "/etc/ld.so.conf.d not found!"
         fi
@@ -196,37 +196,37 @@ function install_jemalloc() {
 }
 
 function install_config() {
-    #${csudo} rm -f ${install_main_dir}/cfg/taos.cfg     || :
+    #${csudo}rm -f ${install_main_dir}/cfg/taos.cfg     || :
 
     if [ ! -f ${cfg_install_dir}/taos.cfg ]; then
-        ${csudo} mkdir -p ${cfg_install_dir}
-        [ -f ${script_dir}/cfg/taos.cfg ] && ${csudo} cp ${script_dir}/cfg/taos.cfg ${cfg_install_dir}
-        ${csudo} chmod 644 ${cfg_install_dir}/*
+        ${csudo}mkdir -p ${cfg_install_dir}
+        [ -f ${script_dir}/cfg/taos.cfg ] && ${csudo}cp ${script_dir}/cfg/taos.cfg ${cfg_install_dir}
+        ${csudo}chmod 644 ${cfg_install_dir}/*
     fi
 
-    ${csudo} cp -f ${script_dir}/cfg/taos.cfg ${install_main_dir}/cfg/taos.cfg.org
-    ${csudo} ln -s ${cfg_install_dir}/taos.cfg ${install_main_dir}/cfg
+    ${csudo}cp -f ${script_dir}/cfg/taos.cfg ${install_main_dir}/cfg/taos.cfg.org
+    ${csudo}ln -s ${cfg_install_dir}/taos.cfg ${install_main_dir}/cfg
 }
 
 
 function install_log() {
-    ${csudo} rm -rf ${log_dir}  || :
+    ${csudo}rm -rf ${log_dir}  || :
 
     if [ "$osType" != "Darwin" ]; then
-        ${csudo} mkdir -p ${log_dir} && ${csudo} chmod 777 ${log_dir}
+        ${csudo}mkdir -p ${log_dir} && ${csudo}chmod 777 ${log_dir}
     else
-        mkdir -p ${log_dir} && ${csudo} chmod 777 ${log_dir}
+        mkdir -p ${log_dir} && ${csudo}chmod 777 ${log_dir}
     fi
-    ${csudo} ln -s ${log_dir} ${install_main_dir}/log
+    ${csudo}ln -s ${log_dir} ${install_main_dir}/log
 }
 
 function install_connector() {
-    ${csudo} cp -rf ${script_dir}/connector/ ${install_main_dir}/
+    ${csudo}cp -rf ${script_dir}/connector/ ${install_main_dir}/
 }
 
 function install_examples() {
     if [ -d ${script_dir}/examples ]; then
-        ${csudo} cp -rf ${script_dir}/examples/* ${install_main_dir}/examples
+        ${csudo}cp -rf ${script_dir}/examples/* ${install_main_dir}/examples
     fi
 }
 

packaging/tools/install_client_jh.sh

@@ -54,7 +54,7 @@ NC='\033[0m'
 
 csudo=""
 if command -v sudo > /dev/null; then
-    csudo="sudo"
+    csudo="sudo "
 fi
 
 update_flag=0
@@ -62,42 +62,42 @@ update_flag=0
 function kill_client() {
   pid=$(ps -ef | grep "jh_taos" | grep -v "grep" | awk '{print $2}')
   if [ -n "$pid" ]; then
-    ${csudo} kill -9 $pid   || :
+    ${csudo}kill -9 $pid   || :
   fi
 }
 
 function install_main_path() {
     #create install main dir and all sub dir
-    ${csudo} rm -rf ${install_main_dir}    || :
-    ${csudo} mkdir -p ${install_main_dir}
-    ${csudo} mkdir -p ${install_main_dir}/cfg
-    ${csudo} mkdir -p ${install_main_dir}/bin
-    ${csudo} mkdir -p ${install_main_dir}/connector
-    ${csudo} mkdir -p ${install_main_dir}/driver
-    ${csudo} mkdir -p ${install_main_dir}/examples
-    ${csudo} mkdir -p ${install_main_dir}/include
+    ${csudo}rm -rf ${install_main_dir}    || :
+    ${csudo}mkdir -p ${install_main_dir}
+    ${csudo}mkdir -p ${install_main_dir}/cfg
+    ${csudo}mkdir -p ${install_main_dir}/bin
+    ${csudo}mkdir -p ${install_main_dir}/connector
+    ${csudo}mkdir -p ${install_main_dir}/driver
+    ${csudo}mkdir -p ${install_main_dir}/examples
+    ${csudo}mkdir -p ${install_main_dir}/include
 }
 
 function install_bin() {
   # Remove links
-  ${csudo} rm -f ${bin_link_dir}/jh_taos         || :
+  ${csudo}rm -f ${bin_link_dir}/jh_taos         || :
   if [ "$osType" != "Darwin" ]; then
-      ${csudo} rm -f ${bin_link_dir}/jhdemo  || :
-      ${csudo} rm -f ${bin_link_dir}/jh_taosdump  || :
+      ${csudo}rm -f ${bin_link_dir}/jhdemo  || :
+      ${csudo}rm -f ${bin_link_dir}/jh_taosdump  || :
   fi
-  ${csudo} rm -f ${bin_link_dir}/rmjh       || :
-  ${csudo} rm -f ${bin_link_dir}/set_core      || :
+  ${csudo}rm -f ${bin_link_dir}/rmjh       || :
+  ${csudo}rm -f ${bin_link_dir}/set_core      || :
 
-  ${csudo} cp -r ${script_dir}/bin/* ${install_main_dir}/bin && ${csudo} chmod 0555 ${install_main_dir}/bin/*
+  ${csudo}cp -r ${script_dir}/bin/* ${install_main_dir}/bin && ${csudo}chmod 0555 ${install_main_dir}/bin/*
 
   #Make link
-  [ -x ${install_main_dir}/bin/jh_taos ] && ${csudo} ln -s ${install_main_dir}/bin/jh_taos ${bin_link_dir}/jh_taos    || :
+  [ -x ${install_main_dir}/bin/jh_taos ] && ${csudo}ln -s ${install_main_dir}/bin/jh_taos ${bin_link_dir}/jh_taos    || :
   if [ "$osType" != "Darwin" ]; then
-      [ -x ${install_main_dir}/bin/jhdemo ] && ${csudo} ln -s ${install_main_dir}/bin/jhdemo ${bin_link_dir}/jhdemo || :
-      [ -x ${install_main_dir}/bin/jh_taosdump ] && ${csudo} ln -s ${install_main_dir}/bin/jh_taosdump ${bin_link_dir}/jh_taosdump || :
+      [ -x ${install_main_dir}/bin/jhdemo ] && ${csudo}ln -s ${install_main_dir}/bin/jhdemo ${bin_link_dir}/jhdemo || :
+      [ -x ${install_main_dir}/bin/jh_taosdump ] && ${csudo}ln -s ${install_main_dir}/bin/jh_taosdump ${bin_link_dir}/jh_taosdump || :
   fi
-  [ -x ${install_main_dir}/bin/remove_client_jh.sh ] && ${csudo} ln -s ${install_main_dir}/bin/remove_client_jh.sh ${bin_link_dir}/rmjh || :
-  [ -x ${install_main_dir}/bin/set_core.sh ] && ${csudo} ln -s ${install_main_dir}/bin/set_core.sh ${bin_link_dir}/set_core || :
+  [ -x ${install_main_dir}/bin/remove_client_jh.sh ] && ${csudo}ln -s ${install_main_dir}/bin/remove_client_jh.sh ${bin_link_dir}/rmjh || :
+  [ -x ${install_main_dir}/bin/set_core.sh ] && ${csudo}ln -s ${install_main_dir}/bin/set_core.sh ${bin_link_dir}/set_core || :
 }
 
 function clean_lib() {
@@ -107,64 +107,64 @@ function clean_lib() {
 
 function install_lib() {
     # Remove links
-    ${csudo} rm -f ${lib_link_dir}/libtaos.*         || :
-    ${csudo} rm -f ${lib64_link_dir}/libtaos.*       || :
+    ${csudo}rm -f ${lib_link_dir}/libtaos.*         || :
+    ${csudo}rm -f ${lib64_link_dir}/libtaos.*       || :
 
-    ${csudo} cp -rf ${script_dir}/driver/* ${install_main_dir}/driver && ${csudo} chmod 777 ${install_main_dir}/driver/*
+    ${csudo}cp -rf ${script_dir}/driver/* ${install_main_dir}/driver && ${csudo}chmod 777 ${install_main_dir}/driver/*
 
     if [ "$osType" != "Darwin" ]; then
-        ${csudo} ln -s ${install_main_dir}/driver/libtaos.* ${lib_link_dir}/libtaos.so.1
-        ${csudo} ln -s ${lib_link_dir}/libtaos.so.1 ${lib_link_dir}/libtaos.so
+        ${csudo}ln -s ${install_main_dir}/driver/libtaos.* ${lib_link_dir}/libtaos.so.1
+        ${csudo}ln -s ${lib_link_dir}/libtaos.so.1 ${lib_link_dir}/libtaos.so
         
         if [ -d "${lib64_link_dir}" ]; then
-	        ${csudo} ln -s ${install_main_dir}/driver/libtaos.* ${lib64_link_dir}/libtaos.so.1       || :
-	        ${csudo} ln -s ${lib64_link_dir}/libtaos.so.1 ${lib64_link_dir}/libtaos.so               || :
+	        ${csudo}ln -s ${install_main_dir}/driver/libtaos.* ${lib64_link_dir}/libtaos.so.1       || :
+	        ${csudo}ln -s ${lib64_link_dir}/libtaos.so.1 ${lib64_link_dir}/libtaos.so               || :
 	      fi
     else
-        ${csudo} ln -s ${install_main_dir}/driver/libtaos.* ${lib_link_dir}/libtaos.1.dylib
-        ${csudo} ln -s ${lib_link_dir}/libtaos.1.dylib ${lib_link_dir}/libtaos.dylib
+        ${csudo}ln -s ${install_main_dir}/driver/libtaos.* ${lib_link_dir}/libtaos.1.dylib
+        ${csudo}ln -s ${lib_link_dir}/libtaos.1.dylib ${lib_link_dir}/libtaos.dylib
     fi
     
-    ${csudo} ldconfig
+    ${csudo}ldconfig
 }
 
 function install_header() {
-    ${csudo} rm -f ${inc_link_dir}/taos.h ${inc_link_dir}/taoserror.h    || :
-    ${csudo} cp -f ${script_dir}/inc/* ${install_main_dir}/include && ${csudo} chmod 644 ${install_main_dir}/include/*
-    ${csudo} ln -s ${install_main_dir}/include/taos.h ${inc_link_dir}/taos.h
-    ${csudo} ln -s ${install_main_dir}/include/taoserror.h ${inc_link_dir}/taoserror.h
+    ${csudo}rm -f ${inc_link_dir}/taos.h ${inc_link_dir}/taoserror.h    || :
+    ${csudo}cp -f ${script_dir}/inc/* ${install_main_dir}/include && ${csudo}chmod 644 ${install_main_dir}/include/*
+    ${csudo}ln -s ${install_main_dir}/include/taos.h ${inc_link_dir}/taos.h
+    ${csudo}ln -s ${install_main_dir}/include/taoserror.h ${inc_link_dir}/taoserror.h
 }
 
 function install_config() {
     if [ ! -f ${cfg_install_dir}/taos.cfg ]; then
-        ${csudo} mkdir -p ${cfg_install_dir}
-        [ -f ${script_dir}/cfg/taos.cfg ] && ${csudo} cp ${script_dir}/cfg/taos.cfg ${cfg_install_dir}
-        ${csudo} chmod 644 ${cfg_install_dir}/*
+        ${csudo}mkdir -p ${cfg_install_dir}
+        [ -f ${script_dir}/cfg/taos.cfg ] && ${csudo}cp ${script_dir}/cfg/taos.cfg ${cfg_install_dir}
+        ${csudo}chmod 644 ${cfg_install_dir}/*
     fi
 
-    ${csudo} cp -f ${script_dir}/cfg/taos.cfg ${install_main_dir}/cfg/taos.cfg.org
-    ${csudo} ln -s ${cfg_install_dir}/taos.cfg ${install_main_dir}/cfg
+    ${csudo}cp -f ${script_dir}/cfg/taos.cfg ${install_main_dir}/cfg/taos.cfg.org
+    ${csudo}ln -s ${cfg_install_dir}/taos.cfg ${install_main_dir}/cfg
 }
 
 
 function install_log() {
-    ${csudo} rm -rf ${log_dir}  || :
+    ${csudo}rm -rf ${log_dir}  || :
 
     if [ "$osType" != "Darwin" ]; then
-        ${csudo} mkdir -p ${log_dir} && ${csudo} chmod 777 ${log_dir}
+        ${csudo}mkdir -p ${log_dir} && ${csudo}chmod 777 ${log_dir}
     else
-        mkdir -p ${log_dir} && ${csudo} chmod 777 ${log_dir}
+        mkdir -p ${log_dir} && ${csudo}chmod 777 ${log_dir}
     fi
-    ${csudo} ln -s ${log_dir} ${install_main_dir}/log
+    ${csudo}ln -s ${log_dir} ${install_main_dir}/log
 }
 
 function install_connector() {
-    ${csudo} cp -rf ${script_dir}/connector/* ${install_main_dir}/connector
+    ${csudo}cp -rf ${script_dir}/connector/* ${install_main_dir}/connector
 }
 
 function install_examples() {
     if [ -d ${script_dir}/examples ]; then
-        ${csudo} cp -rf ${script_dir}/examples/* ${install_main_dir}/examples
+        ${csudo}cp -rf ${script_dir}/examples/* ${install_main_dir}/examples
     fi
 }
 

packaging/tools/install_client_kh.sh

@@ -54,7 +54,7 @@ NC='\033[0m'
 
 csudo=""
 if command -v sudo > /dev/null; then
-    csudo="sudo"
+    csudo="sudo "
 fi
 
 update_flag=0
@@ -62,42 +62,42 @@ update_flag=0
 function kill_client() {
   pid=$(ps -ef | grep "khclient" | grep -v "grep" | awk '{print $2}')
   if [ -n "$pid" ]; then
-    ${csudo} kill -9 $pid   || :
+    ${csudo}kill -9 $pid   || :
   fi
 }
 
 function install_main_path() {
     #create install main dir and all sub dir
-    ${csudo} rm -rf ${install_main_dir}    || :
-    ${csudo} mkdir -p ${install_main_dir}
-    ${csudo} mkdir -p ${install_main_dir}/cfg
-    ${csudo} mkdir -p ${install_main_dir}/bin
-    ${csudo} mkdir -p ${install_main_dir}/connector
-    ${csudo} mkdir -p ${install_main_dir}/driver
-    ${csudo} mkdir -p ${install_main_dir}/examples
-    ${csudo} mkdir -p ${install_main_dir}/include
+    ${csudo}rm -rf ${install_main_dir}    || :
+    ${csudo}mkdir -p ${install_main_dir}
+    ${csudo}mkdir -p ${install_main_dir}/cfg
+    ${csudo}mkdir -p ${install_main_dir}/bin
+    ${csudo}mkdir -p ${install_main_dir}/connector
+    ${csudo}mkdir -p ${install_main_dir}/driver
+    ${csudo}mkdir -p ${install_main_dir}/examples
+    ${csudo}mkdir -p ${install_main_dir}/include
 }
 
 function install_bin() {
   # Remove links
-  ${csudo} rm -f ${bin_link_dir}/khclient         || :
+  ${csudo}rm -f ${bin_link_dir}/khclient         || :
   if [ "$osType" != "Darwin" ]; then
-      ${csudo} rm -f ${bin_link_dir}/khdemo  || :
-      ${csudo} rm -f ${bin_link_dir}/khdump  || :
+      ${csudo}rm -f ${bin_link_dir}/khdemo  || :
+      ${csudo}rm -f ${bin_link_dir}/khdump  || :
   fi
-  ${csudo} rm -f ${bin_link_dir}/rmkh       || :
-  ${csudo} rm -f ${bin_link_dir}/set_core      || :
+  ${csudo}rm -f ${bin_link_dir}/rmkh       || :
+  ${csudo}rm -f ${bin_link_dir}/set_core      || :
 
-  ${csudo} cp -r ${script_dir}/bin/* ${install_main_dir}/bin && ${csudo} chmod 0555 ${install_main_dir}/bin/*
+  ${csudo}cp -r ${script_dir}/bin/* ${install_main_dir}/bin && ${csudo}chmod 0555 ${install_main_dir}/bin/*
 
   #Make link
-  [ -x ${install_main_dir}/bin/khclient ] && ${csudo} ln -s ${install_main_dir}/bin/khclient ${bin_link_dir}/khclient    || :
+  [ -x ${install_main_dir}/bin/khclient ] && ${csudo}ln -s ${install_main_dir}/bin/khclient ${bin_link_dir}/khclient    || :
   if [ "$osType" != "Darwin" ]; then
-      [ -x ${install_main_dir}/bin/khdemo ] && ${csudo} ln -s ${install_main_dir}/bin/khdemo ${bin_link_dir}/khdemo || :
-      [ -x ${install_main_dir}/bin/khdump ] && ${csudo} ln -s ${install_main_dir}/bin/khdump ${bin_link_dir}/khdump || :
+      [ -x ${install_main_dir}/bin/khdemo ] && ${csudo}ln -s ${install_main_dir}/bin/khdemo ${bin_link_dir}/khdemo || :
+      [ -x ${install_main_dir}/bin/khdump ] && ${csudo}ln -s ${install_main_dir}/bin/khdump ${bin_link_dir}/khdump || :
   fi
-  [ -x ${install_main_dir}/bin/remove_client_kh.sh ] && ${csudo} ln -s ${install_main_dir}/bin/remove_client_kh.sh ${bin_link_dir}/rmkh || :
-  [ -x ${install_main_dir}/bin/set_core.sh ] && ${csudo} ln -s ${install_main_dir}/bin/set_core.sh ${bin_link_dir}/set_core || :
+  [ -x ${install_main_dir}/bin/remove_client_kh.sh ] && ${csudo}ln -s ${install_main_dir}/bin/remove_client_kh.sh ${bin_link_dir}/rmkh || :
+  [ -x ${install_main_dir}/bin/set_core.sh ] && ${csudo}ln -s ${install_main_dir}/bin/set_core.sh ${bin_link_dir}/set_core || :
 }
 
 function clean_lib() {
@@ -107,65 +107,65 @@ function clean_lib() {
 
 function install_lib() {
     # Remove links
-    ${csudo} rm -f ${lib_link_dir}/libtaos.*         || :
-    ${csudo} rm -f ${lib64_link_dir}/libtaos.*       || :
-    #${csudo} rm -rf ${v15_java_app_dir}              || :
+    ${csudo}rm -f ${lib_link_dir}/libtaos.*         || :
+    ${csudo}rm -f ${lib64_link_dir}/libtaos.*       || :
+    #${csudo}rm -rf ${v15_java_app_dir}              || :
 
-    ${csudo} cp -rf ${script_dir}/driver/* ${install_main_dir}/driver && ${csudo} chmod 777 ${install_main_dir}/driver/*
+    ${csudo}cp -rf ${script_dir}/driver/* ${install_main_dir}/driver && ${csudo}chmod 777 ${install_main_dir}/driver/*
 
     if [ "$osType" != "Darwin" ]; then
-        ${csudo} ln -s ${install_main_dir}/driver/libtaos.* ${lib_link_dir}/libtaos.so.1
-        ${csudo} ln -s ${lib_link_dir}/libtaos.so.1 ${lib_link_dir}/libtaos.so
+        ${csudo}ln -s ${install_main_dir}/driver/libtaos.* ${lib_link_dir}/libtaos.so.1
+        ${csudo}ln -s ${lib_link_dir}/libtaos.so.1 ${lib_link_dir}/libtaos.so
         
         if [ -d "${lib64_link_dir}" ]; then
-	        ${csudo} ln -s ${install_main_dir}/driver/libtaos.* ${lib64_link_dir}/libtaos.so.1       || :
-	        ${csudo} ln -s ${lib64_link_dir}/libtaos.so.1 ${lib64_link_dir}/libtaos.so               || :
+	        ${csudo}ln -s ${install_main_dir}/driver/libtaos.* ${lib64_link_dir}/libtaos.so.1       || :
+	        ${csudo}ln -s ${lib64_link_dir}/libtaos.so.1 ${lib64_link_dir}/libtaos.so               || :
 	      fi
     else
-        ${csudo} ln -s ${install_main_dir}/driver/libtaos.* ${lib_link_dir}/libtaos.1.dylib
-        ${csudo} ln -s ${lib_link_dir}/libtaos.1.dylib ${lib_link_dir}/libtaos.dylib
+        ${csudo}ln -s ${install_main_dir}/driver/libtaos.* ${lib_link_dir}/libtaos.1.dylib
+        ${csudo}ln -s ${lib_link_dir}/libtaos.1.dylib ${lib_link_dir}/libtaos.dylib
     fi
     
-    ${csudo} ldconfig
+    ${csudo}ldconfig
 }
 
 function install_header() {
-    ${csudo} rm -f ${inc_link_dir}/taos.h ${inc_link_dir}/taoserror.h    || :
-    ${csudo} cp -f ${script_dir}/inc/* ${install_main_dir}/include && ${csudo} chmod 644 ${install_main_dir}/include/*
-    ${csudo} ln -s ${install_main_dir}/include/taos.h ${inc_link_dir}/taos.h
-    ${csudo} ln -s ${install_main_dir}/include/taoserror.h ${inc_link_dir}/taoserror.h
+    ${csudo}rm -f ${inc_link_dir}/taos.h ${inc_link_dir}/taoserror.h    || :
+    ${csudo}cp -f ${script_dir}/inc/* ${install_main_dir}/include && ${csudo}chmod 644 ${install_main_dir}/include/*
+    ${csudo}ln -s ${install_main_dir}/include/taos.h ${inc_link_dir}/taos.h
+    ${csudo}ln -s ${install_main_dir}/include/taoserror.h ${inc_link_dir}/taoserror.h
 }
 
 function install_config() {
     if [ ! -f ${cfg_install_dir}/kinghistorian.cfg ]; then
-        ${csudo} mkdir -p ${cfg_install_dir}
-        [ -f ${script_dir}/cfg/kinghistorian.cfg ] && ${csudo} cp ${script_dir}/cfg/kinghistorian.cfg ${cfg_install_dir}
-        ${csudo} chmod 644 ${cfg_install_dir}/*
+        ${csudo}mkdir -p ${cfg_install_dir}
+        [ -f ${script_dir}/cfg/kinghistorian.cfg ] && ${csudo}cp ${script_dir}/cfg/kinghistorian.cfg ${cfg_install_dir}
+        ${csudo}chmod 644 ${cfg_install_dir}/*
     fi
 
-    ${csudo} cp -f ${script_dir}/cfg/kinghistorian.cfg ${install_main_dir}/cfg/kinghistorian.cfg.org
-    ${csudo} ln -s ${cfg_install_dir}/kinghistorian.cfg ${install_main_dir}/cfg
+    ${csudo}cp -f ${script_dir}/cfg/kinghistorian.cfg ${install_main_dir}/cfg/kinghistorian.cfg.org
+    ${csudo}ln -s ${cfg_install_dir}/kinghistorian.cfg ${install_main_dir}/cfg
 }
 
 
 function install_log() {
-    ${csudo} rm -rf ${log_dir}  || :
+    ${csudo}rm -rf ${log_dir}  || :
 
     if [ "$osType" != "Darwin" ]; then
-        ${csudo} mkdir -p ${log_dir} && ${csudo} chmod 777 ${log_dir}
+        ${csudo}mkdir -p ${log_dir} && ${csudo}chmod 777 ${log_dir}
     else
-        mkdir -p ${log_dir} && ${csudo} chmod 777 ${log_dir}
+        mkdir -p ${log_dir} && ${csudo}chmod 777 ${log_dir}
     fi
-    ${csudo} ln -s ${log_dir} ${install_main_dir}/log
+    ${csudo}ln -s ${log_dir} ${install_main_dir}/log
 }
 
 function install_connector() {
-    ${csudo} cp -rf ${script_dir}/connector/* ${install_main_dir}/connector
+    ${csudo}cp -rf ${script_dir}/connector/* ${install_main_dir}/connector
 }
 
 function install_examples() {
     if [ -d ${script_dir}/examples ]; then
-        ${csudo} cp -rf ${script_dir}/examples/* ${install_main_dir}/examples
+        ${csudo}cp -rf ${script_dir}/examples/* ${install_main_dir}/examples
     fi
 }
 

packaging/tools/install_client_power.sh

@@ -57,7 +57,7 @@ NC='\033[0m'
 
 csudo=""
 if command -v sudo > /dev/null; then
-    csudo="sudo"
+    csudo="sudo "
 fi
 
 update_flag=0
@@ -65,42 +65,42 @@ update_flag=0
 function kill_client() {
   pid=$(ps -ef | grep "power" | grep -v "grep" | awk '{print $2}')
   if [ -n "$pid" ]; then
-    ${csudo} kill -9 $pid   || :
+    ${csudo}kill -9 $pid   || :
   fi
 }
 
 function install_main_path() {
     #create install main dir and all sub dir
-    ${csudo} rm -rf ${install_main_dir}    || :
-    ${csudo} mkdir -p ${install_main_dir}
-    ${csudo} mkdir -p ${install_main_dir}/cfg
-    ${csudo} mkdir -p ${install_main_dir}/bin
-    ${csudo} mkdir -p ${install_main_dir}/connector
-    ${csudo} mkdir -p ${install_main_dir}/driver
-    ${csudo} mkdir -p ${install_main_dir}/examples
-    ${csudo} mkdir -p ${install_main_dir}/include
+    ${csudo}rm -rf ${install_main_dir}    || :
+    ${csudo}mkdir -p ${install_main_dir}
+    ${csudo}mkdir -p ${install_main_dir}/cfg
+    ${csudo}mkdir -p ${install_main_dir}/bin
+    ${csudo}mkdir -p ${install_main_dir}/connector
+    ${csudo}mkdir -p ${install_main_dir}/driver
+    ${csudo}mkdir -p ${install_main_dir}/examples
+    ${csudo}mkdir -p ${install_main_dir}/include
 }
 
 function install_bin() {
   # Remove links
-  ${csudo} rm -f ${bin_link_dir}/power         || :
+  ${csudo}rm -f ${bin_link_dir}/power         || :
   if [ "$osType" != "Darwin" ]; then
-      ${csudo} rm -f ${bin_link_dir}/powerdemo  || :
-      ${csudo} rm -f ${bin_link_dir}/powerdump  || :
+      ${csudo}rm -f ${bin_link_dir}/powerdemo  || :
+      ${csudo}rm -f ${bin_link_dir}/powerdump  || :
   fi
-  ${csudo} rm -f ${bin_link_dir}/rmpower       || :
-  ${csudo} rm -f ${bin_link_dir}/set_core      || :
+  ${csudo}rm -f ${bin_link_dir}/rmpower       || :
+  ${csudo}rm -f ${bin_link_dir}/set_core      || :
 
-  ${csudo} cp -r ${script_dir}/bin/* ${install_main_dir}/bin && ${csudo} chmod 0555 ${install_main_dir}/bin/*
+  ${csudo}cp -r ${script_dir}/bin/* ${install_main_dir}/bin && ${csudo}chmod 0555 ${install_main_dir}/bin/*
 
   #Make link
-  [ -x ${install_main_dir}/bin/power ] && ${csudo} ln -s ${install_main_dir}/bin/power ${bin_link_dir}/power                 || :
+  [ -x ${install_main_dir}/bin/power ] && ${csudo}ln -s ${install_main_dir}/bin/power ${bin_link_dir}/power                 || :
   if [ "$osType" != "Darwin" ]; then
-      [ -x ${install_main_dir}/bin/powerdemo ] && ${csudo} ln -s ${install_main_dir}/bin/powerdemo ${bin_link_dir}/powerdemo || :
-      [ -x ${install_main_dir}/bin/powerdump ] && ${csudo} ln -s ${install_main_dir}/bin/powerdump ${bin_link_dir}/powerdump || :
+      [ -x ${install_main_dir}/bin/powerdemo ] && ${csudo}ln -s ${install_main_dir}/bin/powerdemo ${bin_link_dir}/powerdemo || :
+      [ -x ${install_main_dir}/bin/powerdump ] && ${csudo}ln -s ${install_main_dir}/bin/powerdump ${bin_link_dir}/powerdump || :
   fi
-  [ -x ${install_main_dir}/bin/remove_client_power.sh ] && ${csudo} ln -s ${install_main_dir}/bin/remove_client_power.sh ${bin_link_dir}/rmpower || :
-  [ -x ${install_main_dir}/bin/set_core.sh ] && ${csudo} ln -s ${install_main_dir}/bin/set_core.sh ${bin_link_dir}/set_core || :
+  [ -x ${install_main_dir}/bin/remove_client_power.sh ] && ${csudo}ln -s ${install_main_dir}/bin/remove_client_power.sh ${bin_link_dir}/rmpower || :
+  [ -x ${install_main_dir}/bin/set_core.sh ] && ${csudo}ln -s ${install_main_dir}/bin/set_core.sh ${bin_link_dir}/set_core || :
 }
 
 function clean_lib() {
@@ -110,83 +110,83 @@ function clean_lib() {
 
 function install_lib() {
     # Remove links
-    ${csudo} rm -f ${lib_link_dir}/libtaos.*         || :
-    ${csudo} rm -f ${lib64_link_dir}/libtaos.*       || :
-    #${csudo} rm -rf ${v15_java_app_dir}              || :
+    ${csudo}rm -f ${lib_link_dir}/libtaos.*         || :
+    ${csudo}rm -f ${lib64_link_dir}/libtaos.*       || :
+    #${csudo}rm -rf ${v15_java_app_dir}              || :
 
-    ${csudo} cp -rf ${script_dir}/driver/* ${install_main_dir}/driver && ${csudo} chmod 777 ${install_main_dir}/driver/*
+    ${csudo}cp -rf ${script_dir}/driver/* ${install_main_dir}/driver && ${csudo}chmod 777 ${install_main_dir}/driver/*
 
     if [ "$osType" != "Darwin" ]; then
-        ${csudo} ln -s ${install_main_dir}/driver/libtaos.* ${lib_link_dir}/libtaos.so.1
-        ${csudo} ln -s ${lib_link_dir}/libtaos.so.1 ${lib_link_dir}/libtaos.so
+        ${csudo}ln -s ${install_main_dir}/driver/libtaos.* ${lib_link_dir}/libtaos.so.1
+        ${csudo}ln -s ${lib_link_dir}/libtaos.so.1 ${lib_link_dir}/libtaos.so
 
         if [ -d "${lib64_link_dir}" ]; then
-            ${csudo} ln -s ${install_main_dir}/driver/libtaos.* ${lib64_link_dir}/libtaos.so.1       || :
-            ${csudo} ln -s ${lib64_link_dir}/libtaos.so.1 ${lib64_link_dir}/libtaos.so               || :
+            ${csudo}ln -s ${install_main_dir}/driver/libtaos.* ${lib64_link_dir}/libtaos.so.1       || :
+            ${csudo}ln -s ${lib64_link_dir}/libtaos.so.1 ${lib64_link_dir}/libtaos.so               || :
         fi
     else
-        ${csudo} ln -s ${install_main_dir}/driver/libtaos.* ${lib_link_dir}/libtaos.1.dylib
-        ${csudo} ln -s ${lib_link_dir}/libtaos.1.dylib ${lib_link_dir}/libtaos.dylib
+        ${csudo}ln -s ${install_main_dir}/driver/libtaos.* ${lib_link_dir}/libtaos.1.dylib
+        ${csudo}ln -s ${lib_link_dir}/libtaos.1.dylib ${lib_link_dir}/libtaos.dylib
     fi
 
-    ${csudo} ldconfig
+    ${csudo}ldconfig
 }
 
 function install_header() {
-    ${csudo} rm -f ${inc_link_dir}/taos.h ${inc_link_dir}/taosdef.h ${inc_link_dir}/taoserror.h    || :
-    ${csudo} cp -f ${script_dir}/inc/* ${install_main_dir}/include && ${csudo} chmod 644 ${install_main_dir}/include/*
-    ${csudo} ln -s ${install_main_dir}/include/taos.h ${inc_link_dir}/taos.h
-    ${csudo} ln -s ${install_main_dir}/include/taosdef.h ${inc_link_dir}/taosdef.h
-    ${csudo} ln -s ${install_main_dir}/include/taoserror.h ${inc_link_dir}/taoserror.h
+    ${csudo}rm -f ${inc_link_dir}/taos.h ${inc_link_dir}/taosdef.h ${inc_link_dir}/taoserror.h    || :
+    ${csudo}cp -f ${script_dir}/inc/* ${install_main_dir}/include && ${csudo}chmod 644 ${install_main_dir}/include/*
+    ${csudo}ln -s ${install_main_dir}/include/taos.h ${inc_link_dir}/taos.h
+    ${csudo}ln -s ${install_main_dir}/include/taosdef.h ${inc_link_dir}/taosdef.h
+    ${csudo}ln -s ${install_main_dir}/include/taoserror.h ${inc_link_dir}/taoserror.h
 }
 
 function install_jemalloc() {
     jemalloc_dir=${script_dir}/jemalloc
 
     if [ -d ${jemalloc_dir} ]; then
-        ${csudo} /usr/bin/install -c -d /usr/local/bin
+        ${csudo}/usr/bin/install -c -d /usr/local/bin
 
         if [ -f ${jemalloc_dir}/bin/jemalloc-config ]; then
-            ${csudo} /usr/bin/install -c -m 755 ${jemalloc_dir}/bin/jemalloc-config /usr/local/bin
+            ${csudo}/usr/bin/install -c -m 755 ${jemalloc_dir}/bin/jemalloc-config /usr/local/bin
         fi
         if [ -f ${jemalloc_dir}/bin/jemalloc.sh ]; then
-            ${csudo} /usr/bin/install -c -m 755 ${jemalloc_dir}/bin/jemalloc.sh /usr/local/bin
+            ${csudo}/usr/bin/install -c -m 755 ${jemalloc_dir}/bin/jemalloc.sh /usr/local/bin
         fi
         if [ -f ${jemalloc_dir}/bin/jeprof ]; then
-            ${csudo} /usr/bin/install -c -m 755 ${jemalloc_dir}/bin/jeprof /usr/local/bin
+            ${csudo}/usr/bin/install -c -m 755 ${jemalloc_dir}/bin/jeprof /usr/local/bin
         fi
         if [ -f ${jemalloc_dir}/include/jemalloc/jemalloc.h ]; then
-            ${csudo} /usr/bin/install -c -d /usr/local/include/jemalloc
-            ${csudo} /usr/bin/install -c -m 644 ${jemalloc_dir}/include/jemalloc/jemalloc.h /usr/local/include/jemalloc
+            ${csudo}/usr/bin/install -c -d /usr/local/include/jemalloc
+            ${csudo}/usr/bin/install -c -m 644 ${jemalloc_dir}/include/jemalloc/jemalloc.h /usr/local/include/jemalloc
         fi
         if [ -f ${jemalloc_dir}/lib/libjemalloc.so.2 ]; then
-            ${csudo} /usr/bin/install -c -d /usr/local/lib
-            ${csudo} /usr/bin/install -c -m 755 ${jemalloc_dir}/lib/libjemalloc.so.2 /usr/local/lib
-            ${csudo} ln -sf libjemalloc.so.2 /usr/local/lib/libjemalloc.so
-            ${csudo} /usr/bin/install -c -d /usr/local/lib
+            ${csudo}/usr/bin/install -c -d /usr/local/lib
+            ${csudo}/usr/bin/install -c -m 755 ${jemalloc_dir}/lib/libjemalloc.so.2 /usr/local/lib
+            ${csudo}ln -sf libjemalloc.so.2 /usr/local/lib/libjemalloc.so
+            ${csudo}/usr/bin/install -c -d /usr/local/lib
             if [ -f ${jemalloc_dir}/lib/libjemalloc.a ]; then
-                ${csudo} /usr/bin/install -c -m 755 ${jemalloc_dir}/lib/libjemalloc.a /usr/local/lib
+                ${csudo}/usr/bin/install -c -m 755 ${jemalloc_dir}/lib/libjemalloc.a /usr/local/lib
             fi
             if [ -f ${jemalloc_dir}/lib/libjemalloc_pic.a ]; then
-                ${csudo} /usr/bin/install -c -m 755 ${jemalloc_dir}/lib/libjemalloc_pic.a /usr/local/lib
+                ${csudo}/usr/bin/install -c -m 755 ${jemalloc_dir}/lib/libjemalloc_pic.a /usr/local/lib
             fi
             if [ -f ${jemalloc_dir}/lib/libjemalloc_pic.a ]; then
-                ${csudo} /usr/bin/install -c -d /usr/local/lib/pkgconfig
-                ${csudo} /usr/bin/install -c -m 644 ${jemalloc_dir}/lib/pkgconfig/jemalloc.pc /usr/local/lib/pkgconfig
+                ${csudo}/usr/bin/install -c -d /usr/local/lib/pkgconfig
+                ${csudo}/usr/bin/install -c -m 644 ${jemalloc_dir}/lib/pkgconfig/jemalloc.pc /usr/local/lib/pkgconfig
             fi
         fi
         if [ -f ${jemalloc_dir}/share/doc/jemalloc/jemalloc.html ]; then
-            ${csudo} /usr/bin/install -c -d /usr/local/share/doc/jemalloc
-            ${csudo} /usr/bin/install -c -m 644 ${jemalloc_dir}/share/doc/jemalloc/jemalloc.html /usr/local/share/doc/jemalloc
+            ${csudo}/usr/bin/install -c -d /usr/local/share/doc/jemalloc
+            ${csudo}/usr/bin/install -c -m 644 ${jemalloc_dir}/share/doc/jemalloc/jemalloc.html /usr/local/share/doc/jemalloc
         fi
         if [ -f ${jemalloc_dir}/share/man/man3/jemalloc.3 ]; then
-            ${csudo} /usr/bin/install -c -d /usr/local/share/man/man3
-            ${csudo} /usr/bin/install -c -m 644 ${jemalloc_dir}/share/man/man3/jemalloc.3 /usr/local/share/man/man3
+            ${csudo}/usr/bin/install -c -d /usr/local/share/man/man3
+            ${csudo}/usr/bin/install -c -m 644 ${jemalloc_dir}/share/man/man3/jemalloc.3 /usr/local/share/man/man3
         fi
 
         if [ -d /etc/ld.so.conf.d ]; then
-            echo "/usr/local/lib" | ${csudo} tee /etc/ld.so.conf.d/jemalloc.conf > /dev/null || echo -e "failed to write /etc/ld.so.conf.d/jemalloc.conf"
-            ${csudo} ldconfig
+            echo "/usr/local/lib" | ${csudo}tee /etc/ld.so.conf.d/jemalloc.conf > /dev/null || echo -e "failed to write /etc/ld.so.conf.d/jemalloc.conf"
+            ${csudo}ldconfig
         else
             echo "/etc/ld.so.conf.d not found!"
         fi
@@ -195,34 +195,34 @@ function install_jemalloc() {
 
 function install_config() {
     if [ ! -f ${cfg_install_dir}/power.cfg ]; then
-        ${csudo} mkdir -p ${cfg_install_dir}
-        [ -f ${script_dir}/cfg/power.cfg ] && ${csudo} cp ${script_dir}/cfg/power.cfg ${cfg_install_dir}
-        ${csudo} chmod 644 ${cfg_install_dir}/*
+        ${csudo}mkdir -p ${cfg_install_dir}
+        [ -f ${script_dir}/cfg/power.cfg ] && ${csudo}cp ${script_dir}/cfg/power.cfg ${cfg_install_dir}
+        ${csudo}chmod 644 ${cfg_install_dir}/*
     fi
 
-    ${csudo} cp -f ${script_dir}/cfg/power.cfg ${install_main_dir}/cfg/power.cfg.org
-    ${csudo} ln -s ${cfg_install_dir}/power.cfg ${install_main_dir}/cfg
+    ${csudo}cp -f ${script_dir}/cfg/power.cfg ${install_main_dir}/cfg/power.cfg.org
+    ${csudo}ln -s ${cfg_install_dir}/power.cfg ${install_main_dir}/cfg
 }
 
 
 function install_log() {
-    ${csudo} rm -rf ${log_dir}  || :
+    ${csudo}rm -rf ${log_dir}  || :
 
     if [ "$osType" != "Darwin" ]; then
-        ${csudo} mkdir -p ${log_dir} && ${csudo} chmod 777 ${log_dir}
+        ${csudo}mkdir -p ${log_dir} && ${csudo}chmod 777 ${log_dir}
     else
-        mkdir -p ${log_dir} && ${csudo} chmod 777 ${log_dir}
+        mkdir -p ${log_dir} && ${csudo}chmod 777 ${log_dir}
     fi
-    ${csudo} ln -s ${log_dir} ${install_main_dir}/log
+    ${csudo}ln -s ${log_dir} ${install_main_dir}/log
 }
 
 function install_connector() {
-    ${csudo} cp -rf ${script_dir}/connector/* ${install_main_dir}/connector
+    ${csudo}cp -rf ${script_dir}/connector/* ${install_main_dir}/connector
 }
 
 function install_examples() {
     if [ -d ${script_dir}/examples ]; then
-        ${csudo} cp -rf ${script_dir}/examples/* ${install_main_dir}/examples
+        ${csudo}cp -rf ${script_dir}/examples/* ${install_main_dir}/examples
     fi
 }
 

packaging/tools/install_client_pro.sh

@@ -54,7 +54,7 @@ NC='\033[0m'
 
 csudo=""
 if command -v sudo > /dev/null; then
-    csudo="sudo"
+    csudo="sudo "
 fi
 
 update_flag=0
@@ -62,42 +62,42 @@ update_flag=0
 function kill_client() {
   pid=$(ps -ef | grep "prodbc" | grep -v "grep" | awk '{print $2}')
   if [ -n "$pid" ]; then
-    ${csudo} kill -9 $pid   || :
+    ${csudo}kill -9 $pid   || :
   fi
 }
 
 function install_main_path() {
     #create install main dir and all sub dir
-    ${csudo} rm -rf ${install_main_dir}    || :
-    ${csudo} mkdir -p ${install_main_dir}
-    ${csudo} mkdir -p ${install_main_dir}/cfg
-    ${csudo} mkdir -p ${install_main_dir}/bin
-    ${csudo} mkdir -p ${install_main_dir}/connector
-    ${csudo} mkdir -p ${install_main_dir}/driver
-    ${csudo} mkdir -p ${install_main_dir}/examples
-    ${csudo} mkdir -p ${install_main_dir}/include
+    ${csudo}rm -rf ${install_main_dir}    || :
+    ${csudo}mkdir -p ${install_main_dir}
+    ${csudo}mkdir -p ${install_main_dir}/cfg
+    ${csudo}mkdir -p ${install_main_dir}/bin
+    ${csudo}mkdir -p ${install_main_dir}/connector
+    ${csudo}mkdir -p ${install_main_dir}/driver
+    ${csudo}mkdir -p ${install_main_dir}/examples
+    ${csudo}mkdir -p ${install_main_dir}/include
 }
 
 function install_bin() {
   # Remove links
-  ${csudo} rm -f ${bin_link_dir}/prodbc         || :
+  ${csudo}rm -f ${bin_link_dir}/prodbc         || :
   if [ "$osType" != "Darwin" ]; then
-      ${csudo} rm -f ${bin_link_dir}/prodemo  || :
-      ${csudo} rm -f ${bin_link_dir}/prodump  || :
+      ${csudo}rm -f ${bin_link_dir}/prodemo  || :
+      ${csudo}rm -f ${bin_link_dir}/prodump  || :
   fi
-  ${csudo} rm -f ${bin_link_dir}/rmprodb       || :
-  ${csudo} rm -f ${bin_link_dir}/set_core      || :
+  ${csudo}rm -f ${bin_link_dir}/rmprodb       || :
+  ${csudo}rm -f ${bin_link_dir}/set_core      || :
 
-  ${csudo} cp -r ${script_dir}/bin/* ${install_main_dir}/bin && ${csudo} chmod 0555 ${install_main_dir}/bin/*
+  ${csudo}cp -r ${script_dir}/bin/* ${install_main_dir}/bin && ${csudo}chmod 0555 ${install_main_dir}/bin/*
 
   #Make link
-  [ -x ${install_main_dir}/bin/prodbc ] && ${csudo} ln -s ${install_main_dir}/bin/prodbc ${bin_link_dir}/prodbc                 || :
+  [ -x ${install_main_dir}/bin/prodbc ] && ${csudo}ln -s ${install_main_dir}/bin/prodbc ${bin_link_dir}/prodbc                 || :
   if [ "$osType" != "Darwin" ]; then
-      [ -x ${install_main_dir}/bin/prodemo ] && ${csudo} ln -s ${install_main_dir}/bin/prodemo ${bin_link_dir}/prodemo || :
-      [ -x ${install_main_dir}/bin/prodump ] && ${csudo} ln -s ${install_main_dir}/bin/prodump ${bin_link_dir}/prodump || :
+      [ -x ${install_main_dir}/bin/prodemo ] && ${csudo}ln -s ${install_main_dir}/bin/prodemo ${bin_link_dir}/prodemo || :
+      [ -x ${install_main_dir}/bin/prodump ] && ${csudo}ln -s ${install_main_dir}/bin/prodump ${bin_link_dir}/prodump || :
   fi
-  [ -x ${install_main_dir}/bin/remove_client_prodb.sh ] && ${csudo} ln -s ${install_main_dir}/bin/remove_client_prodb.sh ${bin_link_dir}/rmprodb || :
-  [ -x ${install_main_dir}/bin/set_core.sh ] && ${csudo} ln -s ${install_main_dir}/bin/set_core.sh ${bin_link_dir}/set_core || :
+  [ -x ${install_main_dir}/bin/remove_client_prodb.sh ] && ${csudo}ln -s ${install_main_dir}/bin/remove_client_prodb.sh ${bin_link_dir}/rmprodb || :
+  [ -x ${install_main_dir}/bin/set_core.sh ] && ${csudo}ln -s ${install_main_dir}/bin/set_core.sh ${bin_link_dir}/set_core || :
 }
 
 function clean_lib() {
@@ -107,65 +107,65 @@ function clean_lib() {
 
 function install_lib() {
     # Remove links
-    ${csudo} rm -f ${lib_link_dir}/libtaos.*         || :
-    ${csudo} rm -f ${lib64_link_dir}/libtaos.*       || :
+    ${csudo}rm -f ${lib_link_dir}/libtaos.*         || :
+    ${csudo}rm -f ${lib64_link_dir}/libtaos.*       || :
 
-    ${csudo} cp -rf ${script_dir}/driver/* ${install_main_dir}/driver && ${csudo} chmod 777 ${install_main_dir}/driver/*
+    ${csudo}cp -rf ${script_dir}/driver/* ${install_main_dir}/driver && ${csudo}chmod 777 ${install_main_dir}/driver/*
 
     if [ "$osType" != "Darwin" ]; then
-        ${csudo} ln -s ${install_main_dir}/driver/libtaos.* ${lib_link_dir}/libtaos.so.1
-        ${csudo} ln -s ${lib_link_dir}/libtaos.so.1 ${lib_link_dir}/libtaos.so
+        ${csudo}ln -s ${install_main_dir}/driver/libtaos.* ${lib_link_dir}/libtaos.so.1
+        ${csudo}ln -s ${lib_link_dir}/libtaos.so.1 ${lib_link_dir}/libtaos.so
         
         if [ -d "${lib64_link_dir}" ]; then
-	        ${csudo} ln -s ${install_main_dir}/driver/libtaos.* ${lib64_link_dir}/libtaos.so.1       || :
-	        ${csudo} ln -s ${lib64_link_dir}/libtaos.so.1 ${lib64_link_dir}/libtaos.so               || :
+	        ${csudo}ln -s ${install_main_dir}/driver/libtaos.* ${lib64_link_dir}/libtaos.so.1       || :
+	        ${csudo}ln -s ${lib64_link_dir}/libtaos.so.1 ${lib64_link_dir}/libtaos.so               || :
 	      fi
     else
-        ${csudo} ln -s ${install_main_dir}/driver/libtaos.* ${lib_link_dir}/libtaos.1.dylib
-        ${csudo} ln -s ${lib_link_dir}/libtaos.1.dylib ${lib_link_dir}/libtaos.dylib
+        ${csudo}ln -s ${install_main_dir}/driver/libtaos.* ${lib_link_dir}/libtaos.1.dylib
+        ${csudo}ln -s ${lib_link_dir}/libtaos.1.dylib ${lib_link_dir}/libtaos.dylib
     fi
     
-    ${csudo} ldconfig
+    ${csudo}ldconfig
 }
 
 function install_header() {
-    ${csudo} rm -f ${inc_link_dir}/taos.h ${inc_link_dir}/taosdef.h ${inc_link_dir}/taoserror.h    || :
-    ${csudo} cp -f ${script_dir}/inc/* ${install_main_dir}/include && ${csudo} chmod 644 ${install_main_dir}/include/*
-    ${csudo} ln -s ${install_main_dir}/include/taos.h ${inc_link_dir}/taos.h
-    ${csudo} ln -s ${install_main_dir}/include/taosdef.h ${inc_link_dir}/taosdef.h
-    ${csudo} ln -s ${install_main_dir}/include/taoserror.h ${inc_link_dir}/taoserror.h
+    ${csudo}rm -f ${inc_link_dir}/taos.h ${inc_link_dir}/taosdef.h ${inc_link_dir}/taoserror.h    || :
+    ${csudo}cp -f ${script_dir}/inc/* ${install_main_dir}/include && ${csudo}chmod 644 ${install_main_dir}/include/*
+    ${csudo}ln -s ${install_main_dir}/include/taos.h ${inc_link_dir}/taos.h
+    ${csudo}ln -s ${install_main_dir}/include/taosdef.h ${inc_link_dir}/taosdef.h
+    ${csudo}ln -s ${install_main_dir}/include/taoserror.h ${inc_link_dir}/taoserror.h
 }
 
 function install_config() {
     if [ ! -f ${cfg_install_dir}/prodb.cfg ]; then
-        ${csudo} mkdir -p ${cfg_install_dir}
-        [ -f ${script_dir}/cfg/prodb.cfg ] && ${csudo} cp ${script_dir}/cfg/prodb.cfg ${cfg_install_dir}
-        ${csudo} chmod 644 ${cfg_install_dir}/*
+        ${csudo}mkdir -p ${cfg_install_dir}
+        [ -f ${script_dir}/cfg/prodb.cfg ] && ${csudo}cp ${script_dir}/cfg/prodb.cfg ${cfg_install_dir}
+        ${csudo}chmod 644 ${cfg_install_dir}/*
     fi
 
-    ${csudo} cp -f ${script_dir}/cfg/prodb.cfg ${install_main_dir}/cfg/prodb.cfg.org
-    ${csudo} ln -s ${cfg_install_dir}/prodb.cfg ${install_main_dir}/cfg
+    ${csudo}cp -f ${script_dir}/cfg/prodb.cfg ${install_main_dir}/cfg/prodb.cfg.org
+    ${csudo}ln -s ${cfg_install_dir}/prodb.cfg ${install_main_dir}/cfg
 }
 
 
 function install_log() {
-    ${csudo} rm -rf ${log_dir}  || :
+    ${csudo}rm -rf ${log_dir}  || :
 
     if [ "$osType" != "Darwin" ]; then
-        ${csudo} mkdir -p ${log_dir} && ${csudo} chmod 777 ${log_dir}
+        ${csudo}mkdir -p ${log_dir} && ${csudo}chmod 777 ${log_dir}
     else
-        mkdir -p ${log_dir} && ${csudo} chmod 777 ${log_dir}
+        mkdir -p ${log_dir} && ${csudo}chmod 777 ${log_dir}
     fi
-    ${csudo} ln -s ${log_dir} ${install_main_dir}/log
+    ${csudo}ln -s ${log_dir} ${install_main_dir}/log
 }
 
 function install_connector() {
-    ${csudo} cp -rf ${script_dir}/connector/* ${install_main_dir}/connector
+    ${csudo}cp -rf ${script_dir}/connector/* ${install_main_dir}/connector
 }
 
 function install_examples() {
     if [ -d ${script_dir}/examples ]; then
-        ${csudo} cp -rf ${script_dir}/examples/* ${install_main_dir}/examples
+        ${csudo}cp -rf ${script_dir}/examples/* ${install_main_dir}/examples
     fi
 }
 

packaging/tools/remove_arbi.sh

@@ -20,7 +20,7 @@ service_config_dir="/etc/systemd/system"
 tarbitrator_service_name="tarbitratord"
 csudo=""
 if command -v sudo > /dev/null; then
-    csudo="sudo"
+    csudo="sudo "
 fi
 
 initd_mod=0
@@ -46,24 +46,24 @@ fi
 function kill_tarbitrator() {
   pid=$(ps -ef | grep "tarbitrator" | grep -v "grep" | awk '{print $2}')
   if [ -n "$pid" ]; then
-    ${csudo} kill -9 $pid   || :
+    ${csudo}kill -9 $pid   || :
   fi
 }
 function clean_bin() {
     # Remove link
-    ${csudo} rm -f ${bin_link_dir}/tarbitrator      || :
+    ${csudo}rm -f ${bin_link_dir}/tarbitrator      || :
 }
 
 function clean_header() {
     # Remove link
-    ${csudo} rm -f ${inc_link_dir}/taos.h       || :
-    ${csudo} rm -f ${inc_link_dir}/taosdef.h    || :
-    ${csudo} rm -f ${inc_link_dir}/taoserror.h  || :
+    ${csudo}rm -f ${inc_link_dir}/taos.h       || :
+    ${csudo}rm -f ${inc_link_dir}/taosdef.h    || :
+    ${csudo}rm -f ${inc_link_dir}/taoserror.h  || :
 }
 
 function clean_log() {
     # Remove link
-    ${csudo} rm -rf /arbitrator.log    || :
+    ${csudo}rm -rf /arbitrator.log    || :
 }
 
 function clean_service_on_systemd() {
@@ -71,37 +71,37 @@ function clean_service_on_systemd() {
 
   if systemctl is-active --quiet ${tarbitrator_service_name}; then
       echo "TDengine tarbitrator is running, stopping it..."
-      ${csudo} systemctl stop ${tarbitrator_service_name} &> /dev/null || echo &> /dev/null
+      ${csudo}systemctl stop ${tarbitrator_service_name} &> /dev/null || echo &> /dev/null
   fi
-  ${csudo} systemctl disable ${tarbitrator_service_name} &> /dev/null || echo &> /dev/null
+  ${csudo}systemctl disable ${tarbitrator_service_name} &> /dev/null || echo &> /dev/null
 
-  ${csudo} rm -f ${tarbitratord_service_config}
+  ${csudo}rm -f ${tarbitratord_service_config}
 }
 
 function clean_service_on_sysvinit() {
     if pidof tarbitrator &> /dev/null; then
         echo "TDengine's tarbitrator is running, stopping it..."
-        ${csudo} service tarbitratord stop || :
+        ${csudo}service tarbitratord stop || :
     fi
     
     if ((${initd_mod}==1)); then    
       if [ -e ${service_config_dir}/tarbitratord ]; then 
-        ${csudo} chkconfig --del tarbitratord || :
+        ${csudo}chkconfig --del tarbitratord || :
       fi
     elif ((${initd_mod}==2)); then   
       if [ -e ${service_config_dir}/tarbitratord ]; then 
-        ${csudo} insserv -r tarbitratord || :
+        ${csudo}insserv -r tarbitratord || :
       fi
     elif ((${initd_mod}==3)); then  
       if [ -e ${service_config_dir}/tarbitratord ]; then 
-        ${csudo} update-rc.d -f tarbitratord remove || :
+        ${csudo}update-rc.d -f tarbitratord remove || :
       fi
     fi
 
-    ${csudo} rm -f ${service_config_dir}/tarbitratord || :
+    ${csudo}rm -f ${service_config_dir}/tarbitratord || :
    
     if $(which init &> /dev/null); then
-        ${csudo} init q || :
+        ${csudo}init q || :
     fi
 }
 
@@ -125,6 +125,6 @@ clean_bin
 # Remove log file
 clean_log
 
-${csudo} rm -rf ${install_main_dir}
+${csudo}rm -rf ${install_main_dir}
 
 echo -e "${GREEN}TDengine's arbitrator is removed successfully!${NC}"

src/client/inc/tsclient.h

@@ -440,7 +440,7 @@ int tsParseSql(SSqlObj *pSql, bool initial);
 void tscProcessMsgFromServer(SRpcMsg *rpcMsg, SRpcEpSet *pEpSet);
 int  tscBuildAndSendRequest(SSqlObj *pSql, SQueryInfo* pQueryInfo);
 
-int  tscRenewTableMeta(SSqlObj *pSql, int32_t tableIndex);
+int  tscRenewTableMeta(SSqlObj *pSql);
 void tscAsyncResultOnError(SSqlObj *pSql);
 
 void tscQueueAsyncError(void(*fp), void *param, int32_t code);

src/common/src/tdataformat.c

@@ -894,6 +894,6 @@ SMemRow mergeTwoMemRows(void *buffer, SMemRow row1, SMemRow row2, STSchema *pSch
     }
     ASSERT(kvLen == memRowTLen(tRow));
   }
-  taosArrayDestroy(stashRow);
+  taosArrayDestroy(&stashRow);
   return buffer;
 }