From b1eb0d347aa38e4f57823de779f0951e8a02819c Mon Sep 17 00:00:00 2001
From: Shuduo Sang <sangshuduo@gmail.com>
Date: Thu, 30 Jun 2022 13:40:59 +0800
Subject: [PATCH] fix: install script (#14380)

* [TD-12286]<fix>: script alignly print without sudo

* compile in order for enterprise

* add 5-taos-tools/taosdump/taosdumpTestTypeJson.py

* Revert "add 5-taos-tools/taosdump/taosdumpTestTypeJson.py"

This reverts commit 6fa2a810afbf07dcf3029937926789fd431a1b8b.

* add jemalloc to more components

* determine CPU cores

* fix: sync install script with 2.4

[TD-12286]

* fix: remove csudo from mkdir debug

* fix: remove more csudo from directory maniplation

* fix: packaging/release.sh

Co-authored-by: Shuduo Sang <sdsang@taosdata.com>
---
 packaging/release.sh | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/packaging/release.sh b/packaging/release.sh
index 1148b6df87..3ebcd950b6 100755
--- a/packaging/release.sh
+++ b/packaging/release.sh
@@ -260,9 +260,9 @@ if [ "$osType" != "Darwin" ]; then
       if [[ "$pagMode" == "full" ]]; then
         if [ -d ${top_dir}/src/kit/taos-tools/packaging/deb ]; then
           cd ${top_dir}/src/kit/taos-tools/packaging/deb
+          taos_tools_ver=$(git describe --tags | sed -e 's/ver-//g' | awk -F '-' '{print $1}')
           [ -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} \
             ${compile_dir} ${output_dir} ${taos_tools_ver} ${cpuType} ${osType} ${verMode} ${verType}
         fi
@@ -285,9 +285,9 @@ if [ "$osType" != "Darwin" ]; then
       if [[ "$pagMode" == "full" ]]; then
         if [ -d ${top_dir}/src/kit/taos-tools/packaging/rpm ]; then
           cd ${top_dir}/src/kit/taos-tools/packaging/rpm
+          taos_tools_ver=$(git describe --tags | sed -e 's/ver-//g' | awk -F '-' '{print $1}' | sed -e 's/-/_/g')
           [ -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} \
             ${compile_dir} ${output_dir} ${taos_tools_ver} ${cpuType} ${osType} ${verMode} ${verType}
         fi
-- 
GitLab