From 7b88d1b94ce324f15c7c772847113662c45c0ced Mon Sep 17 00:00:00 2001
From: Shuduo Sang <sangshuduo@gmail.com>
Date: Sat, 2 Oct 2021 23:22:15 +0800
Subject: [PATCH] Hotfix/sangshuduo/td 2936 change mac default path for master
 (#8126)

* change mac default path back after homebrew install support merged.

* fix lib/log path install for mac

* fix library link for mac.

* merge with develop branch.

* fix missed path.
---
 packaging/tools/make_install.sh | 16 +++++++++++++---
 1 file changed, 13 insertions(+), 3 deletions(-)

diff --git a/packaging/tools/make_install.sh b/packaging/tools/make_install.sh
index 5aa5fc032f..4f268045d4 100755
--- a/packaging/tools/make_install.sh
+++ b/packaging/tools/make_install.sh
@@ -45,8 +45,10 @@ else
     inc_link_dir="/usr/local/include"
 
     install_main_dir="/usr/local/Cellar/tdengine/${verNumber}"
+    install_main_2_dir="/usr/local/Cellar/tdengine@${verNumber}/${verNumber}"
 
     bin_dir="/usr/local/Cellar/tdengine/${verNumber}/bin"
+    bin_2_dir="/usr/local/Cellar/tdengine@${verNumber}/${verNumber}/bin"
 fi
 
 service_config_dir="/etc/systemd/system"
@@ -532,8 +534,16 @@ function install_TDengine() {
 ## ==============================Main program starts from here============================
 echo source directory: $1
 echo binary directory: $2
-if [ -x ${bin_dir}/taos ]; then
-    update_TDengine
+if [ "$osType" != "Darwin" ]; then
+    if [ -x ${bin_dir}/taos ]; then
+        update_TDengine
+    else
+        install_TDengine
+    fi
 else
-    install_TDengine
+    if [ -x ${bin_dir}/taos ] || [ -x ${bin_2_dir}/taos ]; then
+        update_TDengine
+    else
+        install_TDengine
+    fi
 fi
-- 
GitLab