Merge branch 'develop' into fix/TD-11789

Jenkinsfile

@@ -450,7 +450,7 @@ pipeline {
         stage('test_b1_s2') {
           agent{label " slave2 || slave12 "}
           steps {
-            timeout(time: 55, unit: 'MINUTES'){
+            timeout(time: 105, unit: 'MINUTES'){
               pre_test()
               sh '''
                 rm -rf /var/lib/taos/*

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/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/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/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/install_client_tq.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 "tq" | 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}/tq         || :
+  ${csudo}rm -f ${bin_link_dir}/tq         || :
   if [ "$osType" != "Darwin" ]; then
-      ${csudo} rm -f ${bin_link_dir}/tqdemo  || :
-      ${csudo} rm -f ${bin_link_dir}/tqdump  || :
+      ${csudo}rm -f ${bin_link_dir}/tqdemo  || :
+      ${csudo}rm -f ${bin_link_dir}/tqdump  || :
   fi
-  ${csudo} rm -f ${bin_link_dir}/rmtq       || :
-  ${csudo} rm -f ${bin_link_dir}/set_core      || :
+  ${csudo}rm -f ${bin_link_dir}/rmtq       || :
+  ${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/tq ] && ${csudo} ln -s ${install_main_dir}/bin/tq ${bin_link_dir}/tq                 || :
+  [ -x ${install_main_dir}/bin/tq ] && ${csudo}ln -s ${install_main_dir}/bin/tq ${bin_link_dir}/tq                 || :
   if [ "$osType" != "Darwin" ]; then
-      [ -x ${install_main_dir}/bin/tqdemo ] && ${csudo} ln -s ${install_main_dir}/bin/tqdemo ${bin_link_dir}/tqdemo || :
-      [ -x ${install_main_dir}/bin/tqdump ] && ${csudo} ln -s ${install_main_dir}/bin/tqdump ${bin_link_dir}/tqdump || :
+      [ -x ${install_main_dir}/bin/tqdemo ] && ${csudo}ln -s ${install_main_dir}/bin/tqdemo ${bin_link_dir}/tqdemo || :
+      [ -x ${install_main_dir}/bin/tqdump ] && ${csudo}ln -s ${install_main_dir}/bin/tqdump ${bin_link_dir}/tqdump || :
   fi
-  [ -x ${install_main_dir}/bin/remove_client_tq.sh ] && ${csudo} ln -s ${install_main_dir}/bin/remove_client_tq.sh ${bin_link_dir}/rmtq || :
-  [ -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_tq.sh ] && ${csudo}ln -s ${install_main_dir}/bin/remove_client_tq.sh ${bin_link_dir}/rmtq || :
+  [ -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,66 +110,66 @@ 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_config() {
     if [ ! -f ${cfg_install_dir}/tq.cfg ]; then
-        ${csudo} mkdir -p ${cfg_install_dir}
-        [ -f ${script_dir}/cfg/tq.cfg ] && ${csudo} cp ${script_dir}/cfg/tq.cfg ${cfg_install_dir}
-        ${csudo} chmod 644 ${cfg_install_dir}/*
+        ${csudo}mkdir -p ${cfg_install_dir}
+        [ -f ${script_dir}/cfg/tq.cfg ] && ${csudo}cp ${script_dir}/cfg/tq.cfg ${cfg_install_dir}
+        ${csudo}chmod 644 ${cfg_install_dir}/*
     fi
 
-    ${csudo} cp -f ${script_dir}/cfg/tq.cfg ${install_main_dir}/cfg/tq.cfg.org
-    ${csudo} ln -s ${cfg_install_dir}/tq.cfg ${install_main_dir}/cfg
+    ${csudo}cp -f ${script_dir}/cfg/tq.cfg ${install_main_dir}/cfg/tq.cfg.org
+    ${csudo}ln -s ${cfg_install_dir}/tq.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/post.sh

@@ -41,7 +41,7 @@ NC='\033[0m'
 
 csudo=""
 if command -v sudo > /dev/null; then
-    csudo="sudo"
+    csudo="sudo "
 fi
 
 initd_mod=0
@@ -65,62 +65,62 @@ else
 fi
 
 function kill_taosadapter() {
-#  ${csudo} pkill -f taosadapter || :
+#  ${csudo}pkill -f taosadapter || :
   pid=$(ps -ef | grep "taosadapter" | grep -v "grep" | awk '{print $2}')
   if [ -n "$pid" ]; then
-    ${csudo} kill -9 $pid   || :
+    ${csudo}kill -9 $pid   || :
   fi
 }
 
 function kill_taosd() {
-#  ${csudo} pkill -f taosd || :
+#  ${csudo}pkill -f taosd || :
   pid=$(ps -ef | grep "taosd" | grep -v "grep" | awk '{print $2}')
   if [ -n "$pid" ]; then
-    ${csudo} kill -9 $pid   || :
+    ${csudo}kill -9 $pid   || :
   fi
 }
 
 function install_include() {
-    ${csudo} rm -f ${inc_link_dir}/taos.h ${inc_link_dir}/taosdef.h ${inc_link_dir}/taoserror.h|| :
-    ${csudo} ln -s ${inc_dir}/taos.h ${inc_link_dir}/taos.h
-    ${csudo} ln -s ${inc_dir}/taosdef.h ${inc_link_dir}/taosdef.h
-    ${csudo} ln -s ${inc_dir}/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}ln -s ${inc_dir}/taos.h ${inc_link_dir}/taos.h
+    ${csudo}ln -s ${inc_dir}/taosdef.h ${inc_link_dir}/taosdef.h
+    ${csudo}ln -s ${inc_dir}/taoserror.h ${inc_link_dir}/taoserror.h
 }
 
 function install_lib() {
-    ${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} ln -s ${lib_dir}/libtaos.* ${lib_link_dir}/libtaos.so.1
-    ${csudo} ln -s ${lib_link_dir}/libtaos.so.1 ${lib_link_dir}/libtaos.so
+    ${csudo}ln -s ${lib_dir}/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} && ! -e ${lib64_link_dir}/libtaos.so ]]; then
-      ${csudo} ln -s ${lib_dir}/libtaos.* ${lib64_link_dir}/libtaos.so.1           || :
-      ${csudo} ln -s ${lib64_link_dir}/libtaos.so.1 ${lib64_link_dir}/libtaos.so   || :
+      ${csudo}ln -s ${lib_dir}/libtaos.* ${lib64_link_dir}/libtaos.so.1           || :
+      ${csudo}ln -s ${lib64_link_dir}/libtaos.so.1 ${lib64_link_dir}/libtaos.so   || :
     fi
 
-    ${csudo} ldconfig
+    ${csudo}ldconfig
 }
 
 function install_bin() {
     # Remove 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 ${bin_link_dir}/taosdump || :
-    ${csudo} rm -f ${bin_link_dir}/rmtaos   || :
-    ${csudo} rm -f ${bin_link_dir}/set_core || :
+    ${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 ${bin_link_dir}/taosdump || :
+    ${csudo}rm -f ${bin_link_dir}/rmtaos   || :
+    ${csudo}rm -f ${bin_link_dir}/set_core || :
 
-    ${csudo} chmod 0555 ${bin_dir}/*
+    ${csudo}chmod 0555 ${bin_dir}/*
 
     #Make link
-    [ -x ${bin_dir}/taos ] && ${csudo} ln -s ${bin_dir}/taos ${bin_link_dir}/taos             || :
-    [ -x ${bin_dir}/taosd ] && ${csudo} ln -s ${bin_dir}/taosd ${bin_link_dir}/taosd          || :
-    [ -x ${bin_dir}/taosadapter ] && ${csudo} ln -s ${bin_dir}/taosadapter ${bin_link_dir}/taosadapter             || :
-    [ -x ${bin_dir}/taosdemo ] && ${csudo} ln -s ${bin_dir}/taosdemo ${bin_link_dir}/taosdemo || :
-    [ -x ${bin_dir}/taosdump ] && ${csudo} ln -s ${bin_dir}/taosdump ${bin_link_dir}/taosdump || :
-    [ -x ${bin_dir}/set_core.sh ] && ${csudo} ln -s ${bin_dir}/set_core.sh ${bin_link_dir}/set_core || :
+    [ -x ${bin_dir}/taos ] && ${csudo}ln -s ${bin_dir}/taos ${bin_link_dir}/taos             || :
+    [ -x ${bin_dir}/taosd ] && ${csudo}ln -s ${bin_dir}/taosd ${bin_link_dir}/taosd          || :
+    [ -x ${bin_dir}/taosadapter ] && ${csudo}ln -s ${bin_dir}/taosadapter ${bin_link_dir}/taosadapter             || :
+    [ -x ${bin_dir}/taosdemo ] && ${csudo}ln -s ${bin_dir}/taosdemo ${bin_link_dir}/taosdemo || :
+    [ -x ${bin_dir}/taosdump ] && ${csudo}ln -s ${bin_dir}/taosdump ${bin_link_dir}/taosdump || :
+    [ -x ${bin_dir}/set_core.sh ] && ${csudo}ln -s ${bin_dir}/set_core.sh ${bin_link_dir}/set_core || :
 }
 
 function add_newHostname_to_hosts() {
@@ -136,7 +136,7 @@ function add_newHostname_to_hosts() {
       return
     fi
   done
-  ${csudo} echo "127.0.0.1  $1" >> /etc/hosts   ||:
+  ${csudo}echo "127.0.0.1  $1" >> /etc/hosts   ||:
 }
 
 function set_hostname() {
@@ -150,7 +150,7 @@ function set_hostname() {
     fi
   done
 
-  ${csudo} hostname $newHostname ||:
+  ${csudo}hostname $newHostname ||:
   retval=`echo $?`
   if [[ $retval != 0 ]]; then
    echo
@@ -163,15 +163,15 @@ function set_hostname() {
 
   #ubuntu/centos /etc/hostname
   if [[ -e /etc/hostname ]]; then
-    ${csudo} echo $newHostname > /etc/hostname   ||:
+    ${csudo}echo $newHostname > /etc/hostname   ||:
   fi
 
   #debian: #HOSTNAME=yourname
   if [[ -e /etc/sysconfig/network ]]; then
-    ${csudo} sed -i -r "s/#*\s*(HOSTNAME=\s*).*/\1$newHostname/" /etc/sysconfig/network   ||:
+    ${csudo}sed -i -r "s/#*\s*(HOSTNAME=\s*).*/\1$newHostname/" /etc/sysconfig/network   ||:
   fi
 
-  ${csudo} sed -i -r "s/#*\s*(fqdn\s*).*/\1$newHostname/" ${cfg_install_dir}/taos.cfg
+  ${csudo}sed -i -r "s/#*\s*(fqdn\s*).*/\1$newHostname/" ${cfg_install_dir}/taos.cfg
   serverFqdn=$newHostname
 
   if [[ -e /etc/hosts ]]; then
@@ -206,7 +206,7 @@ function set_ipAsFqdn() {
     echo -e -n "${GREEN}Unable to get local ip, use 127.0.0.1${NC}"
     localFqdn="127.0.0.1"
     # Write the local FQDN to configuration file
-    ${csudo} sed -i -r "s/#*\s*(fqdn\s*).*/\1$localFqdn/" ${cfg_install_dir}/taos.cfg
+    ${csudo}sed -i -r "s/#*\s*(fqdn\s*).*/\1$localFqdn/" ${cfg_install_dir}/taos.cfg
     serverFqdn=$localFqdn
     echo
     return
@@ -228,7 +228,7 @@ function set_ipAsFqdn() {
           read -p "Please choose an IP from local IP list:" localFqdn
         else
           # Write the local FQDN to configuration file
-          ${csudo} sed -i -r "s/#*\s*(fqdn\s*).*/\1$localFqdn/" ${cfg_install_dir}/taos.cfg
+          ${csudo}sed -i -r "s/#*\s*(fqdn\s*).*/\1$localFqdn/" ${cfg_install_dir}/taos.cfg
           serverFqdn=$localFqdn
           break
         fi
@@ -277,24 +277,24 @@ function local_fqdn_check() {
 function install_taosadapter_config() {
     if [ ! -f "${cfg_install_dir}/taosadapter.toml" ]; then
         [ ! -d %{cfg_install_dir} ] &&
-            ${csudo} ${csudo} mkdir -p ${cfg_install_dir}
-        [ -f ${cfg_dir}/taosadapter.toml ] && ${csudo} cp ${cfg_dir}/taosadapter.toml ${cfg_install_dir}
+            ${csudo}${csudo}mkdir -p ${cfg_install_dir}
+        [ -f ${cfg_dir}/taosadapter.toml ] && ${csudo}cp ${cfg_dir}/taosadapter.toml ${cfg_install_dir}
         [ -f ${cfg_install_dir}/taosadapter.toml ] &&
-            ${csudo} chmod 644 ${cfg_install_dir}/taosadapter.toml
+            ${csudo}chmod 644 ${cfg_install_dir}/taosadapter.toml
     fi
 
     [ -f ${cfg_dir}/taosadapter.toml ] &&
-        ${csudo} mv ${cfg_dir}/taosadapter.toml ${cfg_dir}/taosadapter.toml.new
+        ${csudo}mv ${cfg_dir}/taosadapter.toml ${cfg_dir}/taosadapter.toml.new
 
     [ -f ${cfg_install_dir}/taosadapter.toml ] &&
-        ${csudo} ln -s ${cfg_install_dir}/taosadapter.toml ${cfg_dir}
+        ${csudo}ln -s ${cfg_install_dir}/taosadapter.toml ${cfg_dir}
 }
 
 function install_config() {
     if [ ! -f "${cfg_install_dir}/taos.cfg" ]; then
-        ${csudo} ${csudo} mkdir -p ${cfg_install_dir}
-        [ -f ${cfg_dir}/taos.cfg ] && ${csudo} cp ${cfg_dir}/taos.cfg ${cfg_install_dir}
-        ${csudo} chmod 644 ${cfg_install_dir}/*
+        ${csudo}${csudo}mkdir -p ${cfg_install_dir}
+        [ -f ${cfg_dir}/taos.cfg ] && ${csudo}cp ${cfg_dir}/taos.cfg ${cfg_install_dir}
+        ${csudo}chmod 644 ${cfg_install_dir}/*
     fi
 
     # Save standard input to 6 and open / dev / TTY on standard input
@@ -305,8 +305,8 @@ function install_config() {
     # restore the backup standard input, and turn off 6
     exec 0<&6 6<&-
 
-    ${csudo} mv ${cfg_dir}/taos.cfg ${cfg_dir}/taos.cfg.new
-    ${csudo} ln -s ${cfg_install_dir}/taos.cfg ${cfg_dir}
+    ${csudo}mv ${cfg_dir}/taos.cfg ${cfg_dir}/taos.cfg.new
+    ${csudo}ln -s ${cfg_install_dir}/taos.cfg ${cfg_dir}
     #FQDN_FORMAT="(25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)"
     #FQDN_FORMAT="(:[1-6][0-9][0-9][0-9][0-9]$)"
     #PORT_FORMAT="(/[1-6][0-9][0-9][0-9][0-9]?/)"
@@ -326,7 +326,7 @@ function install_config() {
         # check the format of the firstEp
         #if [[ $firstEp == $FQDN_PATTERN ]]; then
             # Write the first FQDN to configuration file
-            ${csudo} sed -i -r "s/#*\s*(firstEp\s*).*/\1$firstEp/" ${cfg_install_dir}/taos.cfg
+            ${csudo}sed -i -r "s/#*\s*(firstEp\s*).*/\1$firstEp/" ${cfg_install_dir}/taos.cfg
             break
         #else
         #    read -p "Please enter the correct FQDN:port: " firstEp
@@ -349,7 +349,7 @@ function install_config() {
             #if [[ "$emailAddr" =~ $EMAIL_PATTERN ]]; then
                 # Write the email address to temp file
                 email_file="${install_main_dir}/email"
-                ${csudo} bash -c "echo $emailAddr > ${email_file}"
+                ${csudo}bash -c "echo $emailAddr > ${email_file}"
                 break
             #else
             #    read -p "Please enter the correct email address: " emailAddr
@@ -362,24 +362,24 @@ function install_config() {
 
 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 taosd &> /dev/null; then
-        ${csudo} service taosd stop || :
+        ${csudo}service taosd stop || :
     fi
 
     if ((${initd_mod}==1)); then
-        ${csudo} chkconfig --del taosd || :
+        ${csudo}chkconfig --del taosd || :
     elif ((${initd_mod}==2)); then
-        ${csudo} insserv -r taosd || :
+        ${csudo}insserv -r taosd || :
     elif ((${initd_mod}==3)); then
-        ${csudo} update-rc.d -f taosd remove || :
+        ${csudo}update-rc.d -f taosd remove || :
     fi
 
-    ${csudo} rm -f ${service_config_dir}/taosd || :
+    ${csudo}rm -f ${service_config_dir}/taosd || :
 
     if $(which init &> /dev/null); then
-        ${csudo} init q || :
+        ${csudo}init q || :
     fi
 }
 
@@ -389,19 +389,19 @@ function install_service_on_sysvinit() {
     sleep 1
 
     # Install taosd service
-    ${csudo} cp %{init_d_dir}/taosd ${service_config_dir} && ${csudo} chmod a+x ${service_config_dir}/taosd
+    ${csudo}cp %{init_d_dir}/taosd ${service_config_dir} && ${csudo}chmod a+x ${service_config_dir}/taosd
 
     #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 taosd || :
-        ${csudo} chkconfig --level 2345 taosd on || :
+        ${csudo}chkconfig --add taosd || :
+        ${csudo}chkconfig --level 2345 taosd on || :
     elif ((${initd_mod}==2)); then
-        ${csudo} insserv taosd || :
-        ${csudo} insserv -d taosd || :
+        ${csudo}insserv taosd || :
+        ${csudo}insserv -d taosd || :
     elif ((${initd_mod}==3)); then
-        ${csudo} update-rc.d taosd defaults || :
+        ${csudo}update-rc.d taosd defaults || :
     fi
 }
 
@@ -411,11 +411,11 @@ function clean_service_on_systemd() {
     # taosd service already is stoped before install in preinst script
     #if systemctl is-active --quiet taosd; then
     #    echo "TDengine is running, stopping it..."
-    #    ${csudo} systemctl stop taosd &> /dev/null || echo &> /dev/null
+    #    ${csudo}systemctl stop taosd &> /dev/null || echo &> /dev/null
     #fi
-    ${csudo} systemctl disable taosd &> /dev/null || echo &> /dev/null
+    ${csudo}systemctl disable taosd &> /dev/null || echo &> /dev/null
 
-    ${csudo} rm -f ${taosd_service_config}
+    ${csudo}rm -f ${taosd_service_config}
 }
 
 # taos:2345:respawn:/etc/init.d/taosd start
@@ -425,36 +425,36 @@ function install_service_on_systemd() {
 
     taosd_service_config="${service_config_dir}/taosd.service"
 
-    ${csudo} bash -c "echo '[Unit]'                             >> ${taosd_service_config}"
-    ${csudo} bash -c "echo 'Description=TDengine server service' >> ${taosd_service_config}"
-    ${csudo} bash -c "echo 'After=network-online.target taosadapter.service'        >> ${taosd_service_config}"
-    ${csudo} bash -c "echo 'Wants=network-online.target taosadapter.service'        >> ${taosd_service_config}"
-    ${csudo} bash -c "echo                                      >> ${taosd_service_config}"
-    ${csudo} bash -c "echo '[Service]'                          >> ${taosd_service_config}"
-    ${csudo} bash -c "echo 'Type=simple'                        >> ${taosd_service_config}"
-    ${csudo} bash -c "echo 'ExecStart=/usr/bin/taosd'           >> ${taosd_service_config}"
-    ${csudo} bash -c "echo 'ExecStartPre=/usr/local/taos/bin/startPre.sh'           >> ${taosd_service_config}"
-    ${csudo} bash -c "echo 'TimeoutStopSec=1000000s'            >> ${taosd_service_config}"
-    ${csudo} bash -c "echo 'LimitNOFILE=infinity'               >> ${taosd_service_config}"
-    ${csudo} bash -c "echo 'LimitNPROC=infinity'                >> ${taosd_service_config}"
-    ${csudo} bash -c "echo 'LimitCORE=infinity'                 >> ${taosd_service_config}"
-    ${csudo} bash -c "echo 'TimeoutStartSec=0'                  >> ${taosd_service_config}"
-    ${csudo} bash -c "echo 'StandardOutput=null'                >> ${taosd_service_config}"
-    ${csudo} bash -c "echo 'Restart=always'                     >> ${taosd_service_config}"
-    ${csudo} bash -c "echo 'StartLimitBurst=3'                  >> ${taosd_service_config}"
-    ${csudo} bash -c "echo 'StartLimitInterval=60s'             >> ${taosd_service_config}"
-    ${csudo} bash -c "echo                                      >> ${taosd_service_config}"
-    ${csudo} bash -c "echo '[Install]'                          >> ${taosd_service_config}"
-    ${csudo} bash -c "echo 'WantedBy=multi-user.target'         >> ${taosd_service_config}"
-    ${csudo} systemctl enable taosd
+    ${csudo}bash -c "echo '[Unit]'                             >> ${taosd_service_config}"
+    ${csudo}bash -c "echo 'Description=TDengine server service' >> ${taosd_service_config}"
+    ${csudo}bash -c "echo 'After=network-online.target taosadapter.service'        >> ${taosd_service_config}"
+    ${csudo}bash -c "echo 'Wants=network-online.target taosadapter.service'        >> ${taosd_service_config}"
+    ${csudo}bash -c "echo                                      >> ${taosd_service_config}"
+    ${csudo}bash -c "echo '[Service]'                          >> ${taosd_service_config}"
+    ${csudo}bash -c "echo 'Type=simple'                        >> ${taosd_service_config}"
+    ${csudo}bash -c "echo 'ExecStart=/usr/bin/taosd'           >> ${taosd_service_config}"
+    ${csudo}bash -c "echo 'ExecStartPre=/usr/local/taos/bin/startPre.sh'           >> ${taosd_service_config}"
+    ${csudo}bash -c "echo 'TimeoutStopSec=1000000s'            >> ${taosd_service_config}"
+    ${csudo}bash -c "echo 'LimitNOFILE=infinity'               >> ${taosd_service_config}"
+    ${csudo}bash -c "echo 'LimitNPROC=infinity'                >> ${taosd_service_config}"
+    ${csudo}bash -c "echo 'LimitCORE=infinity'                 >> ${taosd_service_config}"
+    ${csudo}bash -c "echo 'TimeoutStartSec=0'                  >> ${taosd_service_config}"
+    ${csudo}bash -c "echo 'StandardOutput=null'                >> ${taosd_service_config}"
+    ${csudo}bash -c "echo 'Restart=always'                     >> ${taosd_service_config}"
+    ${csudo}bash -c "echo 'StartLimitBurst=3'                  >> ${taosd_service_config}"
+    ${csudo}bash -c "echo 'StartLimitInterval=60s'             >> ${taosd_service_config}"
+    ${csudo}bash -c "echo                                      >> ${taosd_service_config}"
+    ${csudo}bash -c "echo '[Install]'                          >> ${taosd_service_config}"
+    ${csudo}bash -c "echo 'WantedBy=multi-user.target'         >> ${taosd_service_config}"
+    ${csudo}systemctl enable taosd
 }
 
 function install_taosadapter_service() {
     if ((${service_mod}==0)); then
         [ -f ${script_dir}/../cfg/taosadapter.service ] &&\
-            ${csudo} cp ${script_dir}/../cfg/taosadapter.service \
+            ${csudo}cp ${script_dir}/../cfg/taosadapter.service \
             ${service_config_dir}/ || :
-        ${csudo} systemctl daemon-reload
+        ${csudo}systemctl daemon-reload
     fi
 }
 
@@ -474,14 +474,14 @@ function install_TDengine() {
     echo -e "${GREEN}Start to install TDengine...${NC}"
 
     #install log and data dir , then ln to /usr/local/taos
-    ${csudo} mkdir -p ${log_dir} && ${csudo} chmod 777 ${log_dir}
-    ${csudo} mkdir -p ${data_dir}
+    ${csudo}mkdir -p ${log_dir} && ${csudo}chmod 777 ${log_dir}
+    ${csudo}mkdir -p ${data_dir}
 
-    ${csudo} rm -rf ${log_link_dir}   || :
-    ${csudo} rm -rf ${data_link_dir}  || :
+    ${csudo}rm -rf ${log_link_dir}   || :
+    ${csudo}rm -rf ${data_link_dir}  || :
 
-    ${csudo} ln -s ${log_dir} ${log_link_dir}     || :
-    ${csudo} ln -s ${data_dir} ${data_link_dir}   || :
+    ${csudo}ln -s ${log_dir} ${log_link_dir}     || :
+    ${csudo}ln -s ${data_dir} ${data_link_dir}   || :
 
     # Install include, lib, binary and service
     install_include
@@ -498,10 +498,10 @@ 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 TDengine     ${NC}: ${csudo} systemctl start taosd${NC}"
+        echo -e "${GREEN_DARK}To start TDengine     ${NC}: ${csudo}systemctl start taosd${NC}"
     elif ((${service_mod}==1)); then
-        echo -e "${GREEN_DARK}To start TDengine     ${NC}: ${csudo} update-rc.d taosd default  ${RED} for the first time${NC}"
-        echo -e "                      : ${csudo} service taosd start ${RED} after${NC}"
+        echo -e "${GREEN_DARK}To start TDengine     ${NC}: ${csudo}update-rc.d taosd default  ${RED} for the first time${NC}"
+        echo -e "                      : ${csudo}service taosd start ${RED} after${NC}"
     else
         echo -e "${GREEN_DARK}To start TDengine     ${NC}: ./taosd${NC}"
     fi

packaging/tools/preun.sh

@@ -20,7 +20,7 @@ taos_service_name="taosd"
 
 csudo=""
 if command -v sudo > /dev/null; then
-    csudo="sudo"
+    csudo="sudo "
 fi
 
 initd_mod=0
@@ -46,14 +46,14 @@ fi
 function kill_taosadapter() {
   pid=$(ps -ef | grep "taosadapter" | grep -v "grep" | awk '{print $2}')
   if [ -n "$pid" ]; then
-    ${csudo} kill -9 $pid   || :
+    ${csudo}kill -9 $pid   || :
   fi
 }
 
 function kill_taosd() {
   pid=$(ps -ef | grep "taosd" | grep -v "grep" | awk '{print $2}')
   if [ -n "$pid" ]; then
-    ${csudo} kill -9 $pid   || :
+    ${csudo}kill -9 $pid   || :
   fi
 }
 
@@ -61,44 +61,44 @@ function clean_service_on_systemd() {
     taosadapter_service_config="${service_config_dir}/taosadapter.service"
     if systemctl is-active --quiet taosadapter; then
         echo "taosadapter is running, stopping it..."
-        ${csudo} systemctl stop taosadapter &> /dev/null || echo &> /dev/null
+        ${csudo}systemctl stop taosadapter &> /dev/null || echo &> /dev/null
     fi
 
     taosd_service_config="${service_config_dir}/${taos_service_name}.service"
 
     if systemctl is-active --quiet ${taos_service_name}; then
         echo "TDengine taosd is running, stopping it..."
-        ${csudo} systemctl stop ${taos_service_name} &> /dev/null || echo &> /dev/null
+        ${csudo}systemctl stop ${taos_service_name} &> /dev/null || echo &> /dev/null
     fi
-    ${csudo} systemctl disable ${taos_service_name} &> /dev/null || echo &> /dev/null
+    ${csudo}systemctl disable ${taos_service_name} &> /dev/null || echo &> /dev/null
 
-    ${csudo} rm -f ${taosd_service_config}
+    ${csudo}rm -f ${taosd_service_config}
 
-    [ -f ${taosadapter_service_config} ] && ${csudo} rm -f ${taosadapter_service_config}
+    [ -f ${taosadapter_service_config} ] && ${csudo}rm -f ${taosadapter_service_config}
 
 }
 
 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 taosd &> /dev/null; then
         echo "TDengine taosd is running, stopping it..."
-        ${csudo} service taosd stop || :
+        ${csudo}service taosd stop || :
     fi
 
     if ((${initd_mod}==1)); then
-        ${csudo} chkconfig --del taosd || :
+        ${csudo}chkconfig --del taosd || :
     elif ((${initd_mod}==2)); then
-        ${csudo} insserv -r taosd || :
+        ${csudo}insserv -r taosd || :
     elif ((${initd_mod}==3)); then
-        ${csudo} update-rc.d -f taosd remove || :
+        ${csudo}update-rc.d -f taosd remove || :
     fi
 
-    ${csudo} rm -f ${service_config_dir}/taosd || :
+    ${csudo}rm -f ${service_config_dir}/taosd || :
 
     if $(which init &> /dev/null); then
-        ${csudo} init q || :
+        ${csudo}init q || :
     fi
 }
 
@@ -118,20 +118,20 @@ function clean_service() {
 clean_service
 
 # 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 ${bin_link_dir}/set_core   || :
-${csudo} rm -f ${cfg_link_dir}/*.new      || :
-${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 ${lib64_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 ${bin_link_dir}/taosdemo   || :
+${csudo}rm -f ${bin_link_dir}/set_core   || :
+${csudo}rm -f ${cfg_link_dir}/*.new      || :
+${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 ${lib64_link_dir}/libtaos.* || :
+
+${csudo}rm -f ${log_link_dir}            || :
+${csudo}rm -f ${data_link_dir}           || :
 
 if ((${service_mod}==2)); then
     kill_taosadapter

packaging/tools/set_core.sh

@@ -15,7 +15,7 @@ corePath=$1
 
 csudo=""
 if command -v sudo > /dev/null; then
-  csudo="sudo"
+  csudo="sudo "
 fi
 
 if [[ ! -n ${corePath} ]]; then
@@ -31,10 +31,10 @@ if [[ ! -n ${corePath} ]]; then
 fi
 
 ulimit -c unlimited
-${csudo} sed -i '/ulimit -c unlimited/d' /etc/profile ||:
-${csudo} sed -i '$a\ulimit -c unlimited' /etc/profile ||:
+${csudo}sed -i '/ulimit -c unlimited/d' /etc/profile ||:
+${csudo}sed -i '$a\ulimit -c unlimited' /etc/profile ||:
 source /etc/profile
 
-${csudo} mkdir -p ${corePath}  ||:
-${csudo} sysctl -w kernel.core_pattern=${corePath}/core-%e-%p  ||:
-${csudo} echo "${corePath}/core-%e-%p" | ${csudo} tee /proc/sys/kernel/core_pattern  ||:
+${csudo}mkdir -p ${corePath}  ||:
+${csudo}sysctl -w kernel.core_pattern=${corePath}/core-%e-%p  ||:
+${csudo}echo "${corePath}/core-%e-%p" | ${csudo}tee /proc/sys/kernel/core_pattern  ||:

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/client/src/tscSubquery.c

@@ -3783,7 +3783,7 @@ void tscSetQuerySort(SQueryInfo* pQueryInfo, SQueryAttr* pQueryAttr) {
     size_t size = taosArrayGetSize(pQueryInfo->pUpstream);
     for(int32_t i = 0; i < size; ++i) {
       SQueryInfo* pq = taosArrayGetP(pQueryInfo->pUpstream, i);
-      if (pq->groupbyTag && pq->interval.interval > 0) {
+      if (pq->groupbyTag) {
         pQueryAttr->needSort = true;
         return;
       }

src/client/src/tscSystem.c

@@ -113,7 +113,7 @@ int32_t tscAcquireRpc(const char *key, const char *user, const char *secretEncry
 
   SRpcObj rpcObj;
   memset(&rpcObj, 0, sizeof(rpcObj));
-  strncpy(rpcObj.key, key, strlen(key));
+  tstrncpy(rpcObj.key, key, sizeof(rpcObj.key));
   rpcObj.pDnodeConn = rpcOpen(&rpcInit);
   if (rpcObj.pDnodeConn == NULL) {
     pthread_mutex_unlock(&rpcObjMutex);

src/connector/C#/src/test/Cases/Utils.cs

@@ -3,7 +3,6 @@ using TDengineDriver;
 using System.Runtime.InteropServices;
 using System.Text;
 using System.Collections.Generic;
-
 namespace Test.UtilsTools
 {
     public class UtilsTools

src/connector/jdbc/src/main/java/com/taosdata/jdbc/rs/RestfulStatement.java

@@ -72,6 +72,7 @@ public class RestfulStatement extends AbstractStatement {
             }
             this.database = sql.trim().replace("use", "").trim();
             this.conn.setCatalog(this.database);
+            this.conn.setClientInfo(TSDBDriver.PROPERTY_KEY_DBNAME, this.database);
             result = false;
         } else if (SqlSyntaxValidator.isDatabaseUnspecifiedQuery(sql)) {
             executeOneQuery(sql);