[TD-12810]<fix>(other): install script cleanup (#9718)

* [TD-12810]<fix>(other): install script cleanup

* [TD-12810]<fix>(other): install script cleanup

fix taosadapter config

* [TD-12810]<fix>(other): install script cleanup

fix make_install.sh

* [TD-12810]<fix>(other): install script cleanup

fix install.sh

* [TD-12810]<fix>(other): install script cleanup

fix makepkg.sh

* [TD-12810]<fix>(other): install script cleanup

remove init.d from deb and rpm

packaging/deb/makedeb.sh

@@ -36,11 +36,11 @@ install_home_path="/usr/local/taos"
 mkdir -p ${pkg_dir}${install_home_path}
 mkdir -p ${pkg_dir}${install_home_path}/bin
 mkdir -p ${pkg_dir}${install_home_path}/cfg
-mkdir -p ${pkg_dir}${install_home_path}/connector
+#mkdir -p ${pkg_dir}${install_home_path}/connector
 mkdir -p ${pkg_dir}${install_home_path}/driver
 mkdir -p ${pkg_dir}${install_home_path}/examples
 mkdir -p ${pkg_dir}${install_home_path}/include
-mkdir -p ${pkg_dir}${install_home_path}/init.d
+#mkdir -p ${pkg_dir}${install_home_path}/init.d
 mkdir -p ${pkg_dir}${install_home_path}/script
 
 cp ${compile_dir}/../packaging/cfg/taos.cfg         ${pkg_dir}${install_home_path}/cfg
@@ -51,7 +51,7 @@ if [ -f "${compile_dir}/test/cfg/taosadapter.service" ]; then
     cp ${compile_dir}/test/cfg/taosadapter.service	${pkg_dir}${install_home_path}/cfg || :
 fi
 
-cp ${compile_dir}/../packaging/deb/taosd            ${pkg_dir}${install_home_path}/init.d
+#cp ${compile_dir}/../packaging/deb/taosd            ${pkg_dir}${install_home_path}/init.d
 cp ${compile_dir}/../packaging/tools/post.sh        ${pkg_dir}${install_home_path}/script
 cp ${compile_dir}/../packaging/tools/preun.sh       ${pkg_dir}${install_home_path}/script
 cp ${compile_dir}/../packaging/tools/startPre.sh    ${pkg_dir}${install_home_path}/bin
@@ -70,10 +70,10 @@ cp ${compile_dir}/../src/inc/taos.h                 ${pkg_dir}${install_home_pat
 cp ${compile_dir}/../src/inc/taosdef.h              ${pkg_dir}${install_home_path}/include
 cp ${compile_dir}/../src/inc/taoserror.h            ${pkg_dir}${install_home_path}/include
 cp -r ${top_dir}/tests/examples/*                   ${pkg_dir}${install_home_path}/examples
-cp -r ${top_dir}/src/connector/python               ${pkg_dir}${install_home_path}/connector
-cp -r ${top_dir}/src/connector/go                   ${pkg_dir}${install_home_path}/connector
-cp -r ${top_dir}/src/connector/nodejs               ${pkg_dir}${install_home_path}/connector
-cp ${compile_dir}/build/lib/taos-jdbcdriver*.*  ${pkg_dir}${install_home_path}/connector ||:
+#cp -r ${top_dir}/src/connector/python               ${pkg_dir}${install_home_path}/connector
+#cp -r ${top_dir}/src/connector/go                   ${pkg_dir}${install_home_path}/connector
+#cp -r ${top_dir}/src/connector/nodejs               ${pkg_dir}${install_home_path}/connector
+#cp ${compile_dir}/build/lib/taos-jdbcdriver*.*  ${pkg_dir}${install_home_path}/connector ||:
 
 install_user_local_path="/usr/local"
 

packaging/rpm/tdengine.spec

@@ -46,11 +46,11 @@ libfile="libtaos.so.%{_version}"
 # create install path, and cp file
 mkdir -p %{buildroot}%{homepath}/bin
 mkdir -p %{buildroot}%{homepath}/cfg
-mkdir -p %{buildroot}%{homepath}/connector
+#mkdir -p %{buildroot}%{homepath}/connector
 mkdir -p %{buildroot}%{homepath}/driver
 mkdir -p %{buildroot}%{homepath}/examples
 mkdir -p %{buildroot}%{homepath}/include
-mkdir -p %{buildroot}%{homepath}/init.d
+#mkdir -p %{buildroot}%{homepath}/init.d
 mkdir -p %{buildroot}%{homepath}/script
 
 cp %{_compiledir}/../packaging/cfg/taos.cfg         %{buildroot}%{homepath}/cfg
@@ -60,7 +60,7 @@ fi
 if [ -f %{_compiledir}/test/cfg/taosadapter.service ]; then
     cp %{_compiledir}/test/cfg/taosadapter.service %{buildroot}%{homepath}/cfg
 fi
-cp %{_compiledir}/../packaging/rpm/taosd            %{buildroot}%{homepath}/init.d
+#cp %{_compiledir}/../packaging/rpm/taosd            %{buildroot}%{homepath}/init.d
 cp %{_compiledir}/../packaging/tools/post.sh        %{buildroot}%{homepath}/script
 cp %{_compiledir}/../packaging/tools/preun.sh       %{buildroot}%{homepath}/script
 cp %{_compiledir}/../packaging/tools/startPre.sh    %{buildroot}%{homepath}/bin
@@ -75,10 +75,10 @@ cp %{_compiledir}/build/lib/${libfile}              %{buildroot}%{homepath}/driv
 cp %{_compiledir}/../src/inc/taos.h                 %{buildroot}%{homepath}/include
 cp %{_compiledir}/../src/inc/taosdef.h              %{buildroot}%{homepath}/include
 cp %{_compiledir}/../src/inc/taoserror.h            %{buildroot}%{homepath}/include
-cp -r %{_compiledir}/../src/connector/python        %{buildroot}%{homepath}/connector
-cp -r %{_compiledir}/../src/connector/go            %{buildroot}%{homepath}/connector
-cp -r %{_compiledir}/../src/connector/nodejs        %{buildroot}%{homepath}/connector
-cp %{_compiledir}/build/lib/taos-jdbcdriver*.*      %{buildroot}%{homepath}/connector ||:
+#cp -r %{_compiledir}/../src/connector/python        %{buildroot}%{homepath}/connector
+#cp -r %{_compiledir}/../src/connector/go            %{buildroot}%{homepath}/connector
+#cp -r %{_compiledir}/../src/connector/nodejs        %{buildroot}%{homepath}/connector
+#cp %{_compiledir}/build/lib/taos-jdbcdriver*.*      %{buildroot}%{homepath}/connector ||:
 cp -r %{_compiledir}/../tests/examples/*            %{buildroot}%{homepath}/examples
 
 if [ -f %{_compiledir}/build/bin/jemalloc-config ]; then

packaging/tools/install.sh

@@ -167,11 +167,11 @@ function install_main_path() {
     ${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}/connector
     ${csudo}mkdir -p ${install_main_dir}/driver
     ${csudo}mkdir -p ${install_main_dir}/examples
     ${csudo}mkdir -p ${install_main_dir}/include
-    ${csudo}mkdir -p ${install_main_dir}/init.d
+#    ${csudo}mkdir -p ${install_main_dir}/init.d
     if [ "$verMode" == "cluster" ]; then
         ${csudo}mkdir -p ${nginx_dir}
     fi
@@ -639,14 +639,14 @@ function install_service_on_sysvinit() {
     # Install taosd service
 
     if ((${os_type}==1)); then
-        ${csudo}cp -f ${script_dir}/init.d/taosd.deb ${install_main_dir}/init.d/taosd
+#        ${csudo}cp -f ${script_dir}/init.d/taosd.deb ${install_main_dir}/init.d/taosd
         ${csudo}cp    ${script_dir}/init.d/taosd.deb ${service_config_dir}/taosd && ${csudo}chmod a+x ${service_config_dir}/taosd
-        ${csudo}cp -f ${script_dir}/init.d/tarbitratord.deb ${install_main_dir}/init.d/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/taosd.rpm ${install_main_dir}/init.d/taosd
+#        ${csudo}cp -f ${script_dir}/init.d/taosd.rpm ${install_main_dir}/init.d/taosd
         ${csudo}cp    ${script_dir}/init.d/taosd.rpm ${service_config_dir}/taosd && ${csudo}chmod a+x ${service_config_dir}/taosd
-        ${csudo}cp -f ${script_dir}/init.d/tarbitratord.rpm ${install_main_dir}/init.d/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
 
@@ -706,7 +706,7 @@ function install_service_on_systemd() {
         ${csudo}cp ${script_dir}/cfg/taosd.service \
         ${service_config_dir}/ || :
     ${csudo}systemctl daemon-reload
-    
+
     #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}"
@@ -736,7 +736,7 @@ function install_service_on_systemd() {
         ${csudo}cp ${script_dir}/cfg/tarbitratord.service \
         ${service_config_dir}/ || :
     ${csudo}systemctl daemon-reload
-    
+
     #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}"
@@ -923,15 +923,14 @@ function update_TDengine() {
     install_log
     install_header
     install_lib
-    if [ "$pagMode" != "lite" ]; then
-      install_connector
-    fi
+#    if [ "$pagMode" != "lite" ]; then
+#      install_connector
+#    fi
     install_examples
     if [ -z $1 ]; then
         install_bin
         install_service
         install_taosadapter_service
-        install_config
         install_taosadapter_config
 
         openresty_work=false
@@ -1008,9 +1007,9 @@ function install_TDengine() {
     #install_avro lib
     #install_avro lib64
 
-    if [ "$pagMode" != "lite" ]; then
-      install_connector
-    fi
+#    if [ "$pagMode" != "lite" ]; then
+#      install_connector
+#    fi
     install_examples
 
     if [ -z $1 ]; then # install service and client
@@ -1018,6 +1017,7 @@ function install_TDengine() {
         install_bin
         install_service
         install_taosadapter_service
+        install_taosadapter_config
 
         openresty_work=false
         if [ "$verMode" == "cluster" ]; then

packaging/tools/make_install.sh

@@ -137,17 +137,17 @@ function install_main_path() {
         ${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}/connector
         ${csudo}mkdir -p ${install_main_dir}/driver
         ${csudo}mkdir -p ${install_main_dir}/examples
         ${csudo}mkdir -p ${install_main_dir}/include
-        ${csudo}mkdir -p ${install_main_dir}/init.d
+#        ${csudo}mkdir -p ${install_main_dir}/init.d
     else
         ${csudo}rm -rf ${install_main_dir}             || ${csudo}rm -rf ${install_main_2_dir}             || :
         ${csudo}mkdir -p ${install_main_dir}           || ${csudo}mkdir -p ${install_main_2_dir}
         ${csudo}mkdir -p ${install_main_dir}/cfg       || ${csudo}mkdir -p ${install_main_2_dir}/cfg
         ${csudo}mkdir -p ${install_main_dir}/bin       || ${csudo}mkdir -p ${install_main_2_dir}/bin
-        ${csudo}mkdir -p ${install_main_dir}/connector || ${csudo}mkdir -p ${install_main_2_dir}/connector
+#        ${csudo}mkdir -p ${install_main_dir}/connector || ${csudo}mkdir -p ${install_main_2_dir}/connector
         ${csudo}mkdir -p ${install_main_dir}/driver    || ${csudo}mkdir -p ${install_main_2_dir}/driver
         ${csudo}mkdir -p ${install_main_dir}/examples  || ${csudo}mkdir -p ${install_main_2_dir}/examples
         ${csudo}mkdir -p ${install_main_dir}/include   || ${csudo}mkdir -p ${install_main_2_dir}/include
@@ -168,9 +168,15 @@ function install_bin() {
         ${csudo}rm -f ${bin_link_dir}/run_taosd.sh || :
         ${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
+        ${csudo}cp -r ${binary_dir}/build/bin/taos ${install_main_dir}/bin || :
+        [ -f ${binary_dir}/build/bin/taosBenchmark ] && ${csudo}cp -r ${binary_dir}/build/bin/taosBenchmark ${install_main_dir}/bin || :
+        [ -f ${install_main_dir}/bin/taosBenchmark ] && ${csudo}ln -sf ${install_main_dir}/bin/taosBenchmark ${install_main_dir}/bin/taosdemo || :
+        [ -f ${binary_dir}/build/bin/taosdump ] && ${csudo}cp -r ${binary_dir}/build/bin/taosdump ${install_main_dir}/bin || :
+        [ -f ${binary_dir}/build/bin/taosadapter ] && ${csudo}cp -r ${binary_dir}/build/bin/taosadapter ${install_main_dir}/bin || :
+        ${csudo}cp -r ${binary_dir}/build/bin/taosd ${install_main_dir}/bin || :
+        ${csudo}cp -r ${binary_dir}/build/bin/tarbitrator ${install_main_dir}/bin || :
 
+        ${csudo}cp -r ${script_dir}/taosd-dump-cfg.gdb   ${install_main_dir}/bin
         ${csudo}cp -r ${script_dir}/remove.sh     ${install_main_dir}/bin
         ${csudo}cp -r ${script_dir}/set_core.sh   ${install_main_dir}/bin
         ${csudo}cp -r ${script_dir}/run_taosd.sh   ${install_main_dir}/bin
@@ -458,10 +464,10 @@ function install_service_on_sysvinit() {
 
     # Install taosd service
     if ((${os_type}==1)); then
-        ${csudo}cp -f ${script_dir}/../deb/taosd ${install_main_dir}/init.d
+#        ${csudo}cp -f ${script_dir}/../deb/taosd ${install_main_dir}/init.d
         ${csudo}cp    ${script_dir}/../deb/taosd ${service_config_dir} && ${csudo}chmod a+x ${service_config_dir}/taosd
     elif ((${os_type}==2)); then
-        ${csudo}cp -f ${script_dir}/../rpm/taosd ${install_main_dir}/init.d
+#        ${csudo}cp -f ${script_dir}/../rpm/taosd ${install_main_dir}/init.d
         ${csudo}cp    ${script_dir}/../rpm/taosd ${service_config_dir} && ${csudo}chmod a+x ${service_config_dir}/taosd
     fi
 
@@ -563,7 +569,7 @@ function update_TDengine() {
     install_log
     install_header
     install_lib
-    install_connector
+#    install_connector
     install_examples
     install_bin
 
@@ -603,7 +609,7 @@ function install_TDengine() {
     install_log
     install_header
     install_lib
-    install_connector
+#    install_connector
     install_examples
     install_bin
 

packaging/tools/makepkg.sh

@@ -248,18 +248,18 @@ 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
+#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
 # Copy release note
 # cp ${script_dir}/release_note ${install_dir}