fix: packaging script for connector (#11922)

for develop branch

[TD-15158]

packaging/tools/install.sh

@@ -827,9 +827,11 @@ function update_TDengine() {
   install_log
   install_header
   install_lib
-#  if [ "$pagMode" != "lite" ]; then
-#    install_connector
-#  fi
+
+  if [ "$verMode" == "cluster" ]; then
+      install_connector
+  fi
+
   install_examples
   if [ -z $1 ]; then
     install_bin
@@ -912,9 +914,9 @@ function install_TDengine() {
   #install_avro lib
   #install_avro lib64
 
-  #    if [ "$pagMode" != "lite" ]; then
-  #      install_connector
-  #    fi
+  if [ "$verMode" == "cluster" ]; then
+      install_connector
+  fi
   install_examples
 
   if [ -z $1 ]; then # install service and client

packaging/tools/install_client.sh

@@ -21,6 +21,7 @@ tarName="taos.tar.gz"
 
 osType=Linux
 pagMode=full
+verMode=edge
 
 if [ "$osType" != "Darwin" ]; then
     script_dir=$(dirname $(readlink -f "$0"))
@@ -85,9 +86,12 @@ function install_main_path() {
   ${csudo}mkdir -p ${install_main_dir}/bin
   ${csudo}mkdir -p ${install_main_dir}/driver
   if [ $productName == "TDengine" ]; then
-#    ${csudo}mkdir -p ${install_main_dir}/connector
     ${csudo}mkdir -p ${install_main_dir}/examples
-    ${csudo}mkdir -p ${install_main_dir}/include
+  fi
+  ${csudo}mkdir -p ${install_main_dir}/include
+  if [ "$verMode" == "cluster" ]; then
+    ${csudo}mkdir -p ${install_main_dir}/connector
+  fi
 }
 
 function install_bin() {
@@ -258,8 +262,8 @@ function update_TDengine() {
     install_header
     install_lib
     install_jemalloc
-    if [ "$pagMode" != "lite" ]; then
-      install_connector
+    if [ "$verMode" == "cluster" ]; then
+        install_connector
     fi
     install_examples
     install_bin
@@ -272,31 +276,31 @@ function update_TDengine() {
 }
 
 function install_TDengine() {
-    # Start to install
-    if [ ! -e ${tarName} ]; then
-        echo "File ${tarName} does not exist"
-        exit 1
-    fi
-    tar -zxf ${tarName}
+  # Start to install
+  if [ ! -e ${tarName} ]; then
+    echo "File ${tarName} does not exist"
+    exit 1
+  fi
+  tar -zxf ${tarName}
 
-    echo -e "${GREEN}Start to install ${productName} client...${NC}"
+  echo -e "${GREEN}Start to install ${productName} client...${NC}"
 
-    install_main_path
-    install_log
-    install_header
-    install_lib
-    install_jemalloc
-    if [ "$pagMode" != "lite" ]; then
-      install_connector
-    fi
-    install_examples
-    install_bin
-    install_config
+  install_main_path
+  install_log
+  install_header
+  install_lib
+  install_jemalloc
+  if [ "$verMode" == "cluster" ]; then
+    install_connector
+  fi
+  install_examples
+  install_bin
+  install_config
 
-    echo
-    echo -e "\033[44;32;1m${productName} client is installed successfully!${NC}"
+  echo
+  echo -e "\033[44;32;1m${productName} client is installed successfully!${NC}"
 
-    rm -rf $(tar -tf ${tarName})
+  rm -rf $(tar -tf ${tarName})
 }
 
 

packaging/tools/makeclient.sh

@@ -127,6 +127,12 @@ if [ "$osType" == "Darwin" ]; then
   sed 's/osType=Linux/osType=Darwin/g' ${install_dir}/install_client.sh >>install_client_temp.sh
   mv install_client_temp.sh ${install_dir}/install_client.sh
 fi
+
+if [ "$verMode" == "cluster" ]; then
+  sed 's/verMode=edge/verMode=cluster/g' ${install_dir}/install_client.sh >>install_client_temp.sh
+  mv install_client_temp.sh ${install_dir}/install_client.sh
+fi
+
 if [ "$pagMode" == "lite" ]; then
   sed 's/pagMode=full/pagMode=lite/g' ${install_dir}/install_client.sh >>install_client_temp.sh
   mv install_client_temp.sh ${install_dir}/install_client.sh
@@ -149,21 +155,32 @@ if [[ $productName == "TDengine" ]]; then
     mkdir -p ${install_dir}/examples/taosbenchmark-json && cp ${examples_dir}/../src/kit/taos-tools/example/* ${install_dir}/examples/taosbenchmark-json
   fi
 
-#  # Copy connector
-#  connector_dir="${code_dir}/connector"
-#  mkdir -p ${install_dir}/connector
-#  if [[ "$pagMode" != "lite" ]] && [[ "$cpuType" != "aarch32" ]]; then
-#    if [ "$osType" != "Darwin" ]; then
-#      cp ${build_dir}/lib/*.jar ${install_dir}/connector || :
-#    fi
-#    if find ${connector_dir}/go -mindepth 1 -maxdepth 1 | read; then
-#      cp -r ${connector_dir}/go ${install_dir}/connector
-#    else
-#      echo "WARNING: go connector not found, please check if want to use it!"
-#    fi
-#    cp -r ${connector_dir}/python ${install_dir}/connector
-#    cp -r ${connector_dir}/nodejs ${install_dir}/connector
-#  fi
+  if [ "$verMode" == "cluster" ]; then
+      # Copy connector
+      connector_dir="${code_dir}/connector"
+      mkdir -p ${install_dir}/connector
+      if [[ "$pagMode" != "lite" ]] && [[ "$cpuType" != "aarch32" ]]; then
+          if [ "$osType" != "Darwin" ]; then
+              cp ${build_dir}/lib/*.jar ${install_dir}/connector || :
+          fi
+          if find ${connector_dir}/go -mindepth 1 -maxdepth 1 | read; then
+              cp -r ${connector_dir}/go ${install_dir}/connector
+          else
+              echo "WARNING: go connector not found, please check if want to use it!"
+          fi
+          git clone --depth 1 https://github.com/taosdata/taos-connector-python ${install_dir}/connector/python
+          rm -rf ${install_dir}/connector/python/.git ||:
+#          cp -r ${connector_dir}/python ${install_dir}/connector
+          git clone --depth 1 https://github.com/taosdata/taos-connector-node ${install_dir}/connector/nodejs
+          rm -rf ${install_dir}/connector/nodejs/.git ||:
+
+          git clone --depth 1 https://github.com/taosdata/taos-connector-dotnet ${install_dir}/connector/dotnet
+          rm -rf ${install_dir}/connector/dotnet/.git ||:
+#          cp -r ${connector_dir}/nodejs ${install_dir}/connector
+          git clone --depth 1 https://github.com/taosdata/libtaos-rs ${install_dir}/connector/rust
+          rm -rf ${install_dir}/connector/rust/.git ||:
+      fi
+  fi
 fi
 # Copy driver
 mkdir -p ${install_dir}/driver

packaging/tools/makepkg.sh

@@ -296,20 +296,34 @@ fi
 mkdir -p ${install_dir}/driver && cp ${lib_files} ${install_dir}/driver && echo "${versionComp}" >${install_dir}/driver/vercomp.txt
 
 # Copy connector
-#connector_dir="${code_dir}/connector"
-#mkdir -p ${install_dir}/connector
-#if [[ "$pagMode" != "lite" ]] && [[ "$cpuType" != "aarch32" ]]; then
-#  cp ${build_dir}/lib/*.jar ${install_dir}/connector || :
-#  if find ${connector_dir}/go -mindepth 1 -maxdepth 1 | read; then
-#    cp -r ${connector_dir}/go ${install_dir}/connector
-#  else
-#    echo "WARNING: go connector not found, please check if want to use it!"
-#  fi
-#  cp -r ${connector_dir}/python ${install_dir}/connector
-#  cp -r ${connector_dir}/nodejs ${install_dir}/connector
-#fi
+if [ "$verMode" == "cluster" ]; then
+    connector_dir="${code_dir}/connector"
+    mkdir -p ${install_dir}/connector
+    if [[ "$pagMode" != "lite" ]] && [[ "$cpuType" != "aarch32" ]]; then
+        cp ${build_dir}/lib/*.jar ${install_dir}/connector || :
+        if find ${connector_dir}/go -mindepth 1 -maxdepth 1 | read; then
+            cp -r ${connector_dir}/go ${install_dir}/connector
+        else
+            echo "WARNING: go connector not found, please check if want to use it!"
+        fi
+        git clone --depth 1 https://github.com/taosdata/taos-connector-python ${install_dir}/connector/python
+        rm -rf ${install_dir}/connector/python/.git ||:
+
+        git clone --depth 1 https://github.com/taosdata/taos-connector-node ${install_dir}/connector/nodejs
+        rm -rf ${install_dir}/connector/nodejs/.git ||:
+
+        git clone --depth 1 https://github.com/taosdata/taos-connector-dotnet ${install_dir}/connector/dotnet
+        rm -rf ${install_dir}/connector/dotnet/.git ||:
+
+        git clone --depth 1 https://github.com/taosdata/libtaos-rs ${install_dir}/connector/rust
+        rm -rf ${install_dir}/connector/rust/.git ||:
+        # cp -r ${connector_dir}/python ${install_dir}/connector
+        # cp -r ${connector_dir}/nodejs ${install_dir}/connector
+    fi
+fi
+
 # Copy release note
-# cp ${script_dir}/release_note ${install_dir}
+cp ${script_dir}/release_note ${install_dir}
 
 # exit 1