From 767bd334918a2fd7cb0efe936de8517c28a59a1e Mon Sep 17 00:00:00 2001
From: hyy1223 <87465579+hyy1223@users.noreply.github.com>
Date: Sat, 28 Aug 2021 08:22:08 -0700
Subject: [PATCH] modify make_install.sh to support homebrew (#7535)

* modify make_install.sh to support homebrew

* d

* modify make_insta.sh to support homebrew

* modify make_install.sh to support homebrew

* asas

* ss

* modify make_install.sh to support homebrew

* modify make_install.sh to support homebrew
---
 packaging/tools/make_install.sh | 96 +++++++++++++++++----------------
 1 file changed, 50 insertions(+), 46 deletions(-)

diff --git a/packaging/tools/make_install.sh b/packaging/tools/make_install.sh
index 55ca1174c9..07f1d61fad 100755
--- a/packaging/tools/make_install.sh
+++ b/packaging/tools/make_install.sh
@@ -19,6 +19,7 @@ else
 fi
 
 # Dynamic directory
+
 data_dir="/var/lib/taos"
 
 if [ "$osType" != "Darwin" ]; then
@@ -29,25 +30,32 @@ fi
 
 data_link_dir="/usr/local/taos/data"
 log_link_dir="/usr/local/taos/log"
-
-cfg_install_dir="/etc/taos"
+if [ "$osType" != "Darwin" ]; then
+    cfg_install_dir="/etc/taos"
+else
+    cfg_install_dir="/usr/local/Cellar/tdengine/${verNumber}/taos"
+fi
 
 if [ "$osType" != "Darwin" ]; then
     bin_link_dir="/usr/bin"
     lib_link_dir="/usr/lib"
     lib64_link_dir="/usr/lib64"
     inc_link_dir="/usr/include"
-else
-    bin_link_dir="/usr/local/bin"
-    lib_link_dir="/usr/local/lib"
-    inc_link_dir="/usr/local/include"
 fi
 
 #install main path
-install_main_dir="/usr/local/taos"
+if [ "$osType" != "Darwin" ]; then
+    install_main_dir="/usr/local/taos"
+else
+    install_main_dir="/usr/local/Cellar/tdengine/${verNumber}"
+fi
 
 # old bin dir
-bin_dir="/usr/local/taos/bin"
+if [ "$osType" != "Darwin" ]; then
+     bin_dir="/usr/local/taos/bin"
+else
+     bin_dir="/usr/local/Cellar/tdengine/${verNumber}/bin"
+fi
 
 service_config_dir="/etc/systemd/system"
 
@@ -59,12 +67,11 @@ GREEN_UNDERLINE='\033[4;32m'
 NC='\033[0m'
 
 csudo=""
-if command -v sudo > /dev/null; then
-    csudo="sudo"
-fi
 
 if [ "$osType" != "Darwin" ]; then
-
+    if command -v sudo > /dev/null; then
+    csudo="sudo"
+    fi
     initd_mod=0
     service_mod=2
     if pidof systemd &> /dev/null; then
@@ -137,18 +144,16 @@ function install_main_path() {
 
 function install_bin() {
     # Remove links
-    ${csudo} rm -f ${bin_link_dir}/taos         || :
-
     if [ "$osType" != "Darwin" ]; then
+        ${csudo} rm -f ${bin_link_dir}/taos     || :
         ${csudo} rm -f ${bin_link_dir}/taosd    || :
         ${csudo} rm -f ${bin_link_dir}/taosdemo || :
         ${csudo} rm -f ${bin_link_dir}/perfMonitor || :
         ${csudo} rm -f ${bin_link_dir}/taosdump || :
         ${csudo} rm -f ${bin_link_dir}/set_core || :
+        ${csudo} rm -f ${bin_link_dir}/rmtaos   || :
     fi
-
-    ${csudo} rm -f ${bin_link_dir}/rmtaos       || :
-
+    
     ${csudo} cp -r ${binary_dir}/build/bin/* ${install_main_dir}/bin
     ${csudo} cp -r ${script_dir}/taosd-dump-cfg.gdb   ${install_main_dir}/bin
 
@@ -162,20 +167,17 @@ function install_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         || :
-
     if [ "$osType" != "Darwin" ]; then
+        [ -x ${install_main_dir}/bin/taos ]      && ${csudo} ln -s ${install_main_dir}/bin/taos ${bin_link_dir}/taos    || :
         [ -x ${install_main_dir}/bin/taosd ]     && ${csudo} ln -s ${install_main_dir}/bin/taosd ${bin_link_dir}/taosd   || :
         [ -x ${install_main_dir}/bin/taosdump ]  && ${csudo} ln -s ${install_main_dir}/bin/taosdump ${bin_link_dir}/taosdump || :
         [ -x ${install_main_dir}/bin/taosdemo ]  && ${csudo} ln -s ${install_main_dir}/bin/taosdemo ${bin_link_dir}/taosdemo || :
         [ -x ${install_main_dir}/bin/perfMonitor ]  && ${csudo} ln -s ${install_main_dir}/bin/perfMonitor ${bin_link_dir}/perfMonitor || :
         [ -x ${install_main_dir}/set_core.sh ]  && ${csudo} ln -s ${install_main_dir}/bin/set_core.sh ${bin_link_dir}/set_core || :
     fi
-
+    
     if [ "$osType" != "Darwin" ]; then
-        [ -x ${install_main_dir}/bin/remove.sh ] && ${csudo} ln -s ${install_main_dir}/bin/remove.sh ${bin_link_dir}/rmtaos  || :
-    else
-        [ -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/remove.sh ] && ${csudo} ln -s ${install_main_dir}/bin/remove.sh ${bin_link_dir}/rmtaos  || :
     fi
 }
 
@@ -222,7 +224,7 @@ function install_jemalloc() {
         fi
 
         if [ -d /etc/ld.so.conf.d ]; then
-            ${csudo} echo "/usr/local/lib" > /etc/ld.so.conf.d/jemalloc.conf
+            echo "/usr/local/lib" | ${csudo} tee /etc/ld.so.conf.d/jemalloc.conf
             ${csudo} ldconfig
         else
             echo "/etc/ld.so.conf.d not found!"
@@ -248,10 +250,8 @@ function install_lib() {
         fi
     else
         ${csudo} cp -Rf ${binary_dir}/build/lib/libtaos.* ${install_main_dir}/driver && ${csudo} chmod 777 ${install_main_dir}/driver/*
-        ${csudo} ln -sf ${install_main_dir}/driver/libtaos.1.dylib ${lib_link_dir}/libtaos.1.dylib
-        ${csudo} ln -sf ${lib_link_dir}/libtaos.1.dylib ${lib_link_dir}/libtaos.dylib
     fi
-
+    
     install_jemalloc
 
     if [ "$osType" != "Darwin" ]; then
@@ -261,10 +261,14 @@ function install_lib() {
 
 function install_header() {
 
-    ${csudo} rm -f ${inc_link_dir}/taos.h ${inc_link_dir}/taoserror.h    || :
+    if [ "$osType" != "Darwin" ]; then
+        ${csudo} rm -f ${inc_link_dir}/taos.h ${inc_link_dir}/taoserror.h    || :
+    fi
     ${csudo} cp -f ${source_dir}/src/inc/taos.h ${source_dir}/src/inc/taoserror.h ${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
+    if [ "$osType" != "Darwin" ]; then
+        ${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
+    fi
 }
 
 function install_config() {
@@ -272,29 +276,30 @@ 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}
+        [ -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
+    
+    if [ "$osType" != "Darwin" ]; then ${csudo} ln -s ${cfg_install_dir}/taos.cfg ${install_main_dir}/cfg
+    fi
 }
 
 function install_log() {
-    ${csudo} rm -rf ${log_dir}  || :
-
     if [ "$osType" != "Darwin" ]; then
-        ${csudo} mkdir -p ${log_dir} && ${csudo} chmod 777 ${log_dir}
-    else
-        mkdir -p ${log_dir} && chmod 777 ${log_dir}
+            ${csudo} rm -rf ${log_dir}  || :
+            ${csudo} mkdir -p ${log_dir} && ${csudo} chmod 777 ${log_dir}
+            ${csudo} ln -s ${log_dir} ${install_main_dir}/log
     fi
-
-    ${csudo} ln -s ${log_dir} ${install_main_dir}/log
 }
 
 function install_data() {
-    ${csudo} mkdir -p ${data_dir}
-    ${csudo} ln -s ${data_dir} ${install_main_dir}/data
+    if [ "$osType" != "Darwin" ]; then
+        ${csudo} mkdir -p ${data_dir}
+        ${csudo} ln -s ${data_dir} ${install_main_dir}/data
+    fi
 }
 
 function install_connector() {
@@ -309,7 +314,6 @@ function install_connector() {
         echo "WARNING: go connector not found, please check if want to use it!"
     fi
     ${csudo} cp -rf ${source_dir}/src/connector/python ${install_main_dir}/connector
-
     ${csudo} cp ${binary_dir}/build/lib/*.jar ${install_main_dir}/connector &> /dev/null && ${csudo} chmod 777 ${install_main_dir}/connector/*.jar || echo &> /dev/null
 }
 
@@ -489,24 +493,24 @@ function install_TDengine() {
     else
         echo -e "${GREEN}Start to install TDEngine Client ...${NC}"
     fi
-
+    
     install_main_path
 
     if [ "$osType" != "Darwin" ]; then
         install_data
     fi
+
     install_log
     install_header
     install_lib
     install_connector
     install_examples
-
     install_bin
-
+    
     if [ "$osType" != "Darwin" ]; then
         install_service
     fi
-
+    
     install_config
 
     if [ "$osType" != "Darwin" ]; then
-- 
GitLab