From a1a67b1bfdd5827a41f88071fefa038b999d5e4c Mon Sep 17 00:00:00 2001 From: huili Date: Tue, 16 Jul 2019 15:36:25 +0800 Subject: [PATCH 1/7] [modify libtaos.so link] --- packaging/deb/makedeb.sh | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/packaging/deb/makedeb.sh b/packaging/deb/makedeb.sh index c5bc5953b4..dfcb484524 100755 --- a/packaging/deb/makedeb.sh +++ b/packaging/deb/makedeb.sh @@ -24,6 +24,9 @@ fi mkdir -p ${pkg_dir} cd ${pkg_dir} +versioninfo=$(${script_dir}/../tools/get_version.sh) +libfile="libtaos.so.${versioninfo}" + # create install dir install_home_path="/usr/local/taos" mkdir -p ${pkg_dir}${install_home_path} @@ -43,7 +46,7 @@ cp ${compile_dir}/../packaging/tools/preun.sh ${pkg_dir}${install_home_pat cp ${compile_dir}/build/bin/taosdump ${pkg_dir}${install_home_path}/bin cp ${compile_dir}/build/bin/taosd ${pkg_dir}${install_home_path}/bin cp ${compile_dir}/build/bin/taos ${pkg_dir}${install_home_path}/bin -cp ${compile_dir}/build/lib/libtaos.so ${pkg_dir}${install_home_path}/driver +cp ${compile_dir}/build/lib/${libfile} ${pkg_dir}${install_home_path}/driver cp ${compile_dir}/../src/inc/taos.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/grafana ${pkg_dir}${install_home_path}/connector From c4befd96e22d086ea0ce408192a3cf03b871e1d6 Mon Sep 17 00:00:00 2001 From: huili Date: Tue, 16 Jul 2019 15:36:34 +0800 Subject: [PATCH 2/7] [modify libtaos.so link] --- packaging/rpm/tdengine.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/packaging/rpm/tdengine.spec b/packaging/rpm/tdengine.spec index a92487d246..04d79b2172 100644 --- a/packaging/rpm/tdengine.spec +++ b/packaging/rpm/tdengine.spec @@ -38,6 +38,9 @@ echo topdir: %{_topdir} echo version: %{_version} echo buildroot: %{buildroot} +versioninfo=$(%{_compiledir}/../packaging/tools/get_version.sh) +libfile="libtaos.so.${versioninfo}" + # create install path, and cp file mkdir -p %{buildroot}%{homepath}/bin mkdir -p %{buildroot}%{homepath}/cfg @@ -55,7 +58,7 @@ cp %{_compiledir}/../packaging/tools/preun.sh %{buildroot}%{homepath}/scri cp %{_compiledir}/build/bin/taos %{buildroot}%{homepath}/bin cp %{_compiledir}/build/bin/taosd %{buildroot}%{homepath}/bin cp %{_compiledir}/build/bin/taosdump %{buildroot}%{homepath}/bin -cp %{_compiledir}/build/lib/libtaos.so %{buildroot}%{homepath}/driver +cp %{_compiledir}/build/lib/${libfile} %{buildroot}%{homepath}/driver cp %{_compiledir}/../src/inc/taos.h %{buildroot}%{homepath}/include cp -r %{_compiledir}/../src/connector/grafana %{buildroot}%{homepath}/connector cp -r %{_compiledir}/../src/connector/python %{buildroot}%{homepath}/connector From bca98610040ab68921c36b061ff5dc8f60fb4cf2 Mon Sep 17 00:00:00 2001 From: huili Date: Tue, 16 Jul 2019 15:36:41 +0800 Subject: [PATCH 3/7] [modify libtaos.so link] --- packaging/tools/install.sh | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/packaging/tools/install.sh b/packaging/tools/install.sh index 4d2a66d605..1883493dbc 100755 --- a/packaging/tools/install.sh +++ b/packaging/tools/install.sh @@ -79,12 +79,12 @@ function install_bin() { function install_lib() { # Remove links - sudo rm -f ${lib_link_dir}/libtaos.so || : + sudo rm -f ${lib_link_dir}/libtaos.* || : sudo cp -rf ${script_dir}/driver/* ${install_main_dir}/driver && sudo chmod 777 ${install_main_dir}/driver/* - sudo ln -s ${install_main_dir}/driver/libtaos.* ${install_main_dir}/driver/libtaos.so.1 - sudo ln -s ${install_main_dir}/driver/libtaos.so.1 ${lib_link_dir}/libtaos.so + sudo ln -s ${install_main_dir}/driver/libtaos.* ${lib_link_dir}/libtaos.so.1 + sudo ln -s ${lib_link_dir}/libtaos.so.1 ${lib_link_dir}/libtaos.so } function install_header() { From d94d484ec7d22dc532e9061f0a37d6d4a6a20d15 Mon Sep 17 00:00:00 2001 From: huili Date: Tue, 16 Jul 2019 15:36:48 +0800 Subject: [PATCH 4/7] [modify libtaos.so link] --- packaging/tools/make_install.sh | 40 ++++++++++++++++----------------- 1 file changed, 20 insertions(+), 20 deletions(-) diff --git a/packaging/tools/make_install.sh b/packaging/tools/make_install.sh index 5176c76a83..acdfd64343 100755 --- a/packaging/tools/make_install.sh +++ b/packaging/tools/make_install.sh @@ -89,8 +89,8 @@ function install_lib() { versioninfo=$(${script_dir}/get_version.sh) sudo cp ${binary_dir}/build/lib/libtaos.so.${versioninfo} ${install_main_dir}/driver && sudo chmod 777 ${install_main_dir}/driver/* - sudo ln -sf ${install_main_dir}/driver/libtaos.so.${versioninfo} ${install_main_dir}/driver/libtaos.so.1 - sudo ln -sf ${install_main_dir}/driver/libtaos.so.1 ${lib_link_dir}/libtaos.so + sudo ln -sf ${install_main_dir}/driver/libtaos.so.${versioninfo} ${lib_link_dir}/libtaos.so.1 + sudo ln -sf ${lib_link_dir}/libtaos.so.1 ${lib_link_dir}/libtaos.so } function install_header() { @@ -223,14 +223,14 @@ function update_TDengine() { fi sleep 1 fi - + install_main_path install_log install_header install_lib install_bin - install_service + # install_service install_config install_connector install_examples @@ -239,14 +239,14 @@ function update_TDengine() { echo -e "\033[44;32;1mTDengine is updated successfully!${NC}" echo echo -e "${GREEN_DARK}To configure TDengine ${NC}: edit /etc/taos/taos.cfg" - if is_using_systemd; then - echo -e "${GREEN_DARK}To start TDengine ${NC}: sudo systemctl start taosd${NC}" - else - echo -e "${GREEN_DARK}To start TDengine ${NC}: sudo update-rc.d taosd default ${RED} for the first time${NC}" - echo -e " : sudo service taosd start ${RED} after${NC}" - fi + # if is_using_systemd; then + # echo -e "${GREEN_DARK}To start TDengine ${NC}: sudo systemctl start taosd${NC}" + # else + # echo -e "${GREEN_DARK}To start TDengine ${NC}: sudo update-rc.d taosd default ${RED} for the first time${NC}" + # echo -e " : sudo service taosd start ${RED} after${NC}" + # fi - echo -e "${GREEN_DARK}To access TDengine ${NC}: use ${GREEN_UNDERLINE}taos${NC} in shell${NC}" + # echo -e "${GREEN_DARK}To access TDengine ${NC}: use ${GREEN_UNDERLINE}taos${NC} in shell${NC}" echo echo -e "\033[44;32;1mTDengine is updated successfully!${NC}" } @@ -255,13 +255,13 @@ function install_TDengine() { # Start to install echo -e "${GREEN}Start to install TDEngine...${NC}" - install_main_path + install_main_path install_data install_log install_header install_bin install_lib - install_service + # install_service install_config install_connector install_examples @@ -271,14 +271,14 @@ function install_TDengine() { echo -e "\033[44;32;1mTDengine is installed successfully!${NC}" echo echo -e "${GREEN_DARK}To configure TDengine ${NC}: edit /etc/taos/taos.cfg" - if is_using_systemd; then - echo -e "${GREEN_DARK}To start TDengine ${NC}: sudo systemctl start taosd${NC}" - else - echo -e "${GREEN_DARK}To start TDengine ${NC}: sudo update-rc.d taosd default ${RED} for the first time${NC}" - echo -e " : sudo service taosd start ${RED} after${NC}" - fi + # if is_using_systemd; then + # echo -e "${GREEN_DARK}To start TDengine ${NC}: sudo systemctl start taosd${NC}" + # else + # echo -e "${GREEN_DARK}To start TDengine ${NC}: sudo update-rc.d taosd default ${RED} for the first time${NC}" + # echo -e " : sudo service taosd start ${RED} after${NC}" + #3 fi - echo -e "${GREEN_DARK}To access TDengine ${NC}: use ${GREEN_UNDERLINE}taos${NC} in shell${NC}" + # echo -e "${GREEN_DARK}To access TDengine ${NC}: use ${GREEN_UNDERLINE}taos${NC} in shell${NC}" echo echo -e "\033[44;32;1mTDengine is installed successfully!${NC}" } From 43fd5991e5a7fd69a7feb5087b9f36accdfe3b8d Mon Sep 17 00:00:00 2001 From: huili Date: Tue, 16 Jul 2019 15:36:56 +0800 Subject: [PATCH 5/7] [modify libtaos.so link] --- packaging/tools/post.sh | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/packaging/tools/post.sh b/packaging/tools/post.sh index 2583d74275..94048e7b9a 100755 --- a/packaging/tools/post.sh +++ b/packaging/tools/post.sh @@ -52,8 +52,9 @@ function install_include() { function install_lib() { sudo rm -f ${lib_link_dir}/libtaos.so || : - sudo ln -s ${lib_dir}/libtaos.so ${lib_link_dir}/libtaos.so - #sudo ln -s ${lib_dir}/libtaos.so.1 ${lib_link_dir}/libtaos.so.1 || : + + sudo ln -s ${lib_dir}/libtaos.* ${lib_link_dir}/libtaos.so.1 + sudo ln -s ${lib_link_dir}/libtaos.so.1 ${lib_link_dir}/libtaos.so } function install_bin() { From 5dea405e43eb6d1b8b77d77ccbd1f393554e7d52 Mon Sep 17 00:00:00 2001 From: huili Date: Tue, 16 Jul 2019 15:37:02 +0800 Subject: [PATCH 6/7] [modify libtaos.so link] --- packaging/tools/preun.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packaging/tools/preun.sh b/packaging/tools/preun.sh index ed1ee675cb..5fb46acda5 100755 --- a/packaging/tools/preun.sh +++ b/packaging/tools/preun.sh @@ -72,7 +72,7 @@ sudo rm -f ${bin_link_dir}/taosd || : sudo rm -f ${bin_link_dir}/taosdump || : sudo rm -f ${cfg_link_dir}/* || : sudo rm -f ${inc_link_dir}/taos.h || : -sudo rm -f ${lib_link_dir}/libtaos.so || : +sudo rm -f ${lib_link_dir}/libtaos.* || : sudo rm -f ${log_link_dir} || : sudo rm -f ${data_link_dir} || : From 60673a9fbe10d0d9f482ce37d3a153c4d85dd4b4 Mon Sep 17 00:00:00 2001 From: huili Date: Tue, 16 Jul 2019 15:37:08 +0800 Subject: [PATCH 7/7] [modify libtaos.so link] --- packaging/tools/remove.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packaging/tools/remove.sh b/packaging/tools/remove.sh index c5851f4681..921103c197 100755 --- a/packaging/tools/remove.sh +++ b/packaging/tools/remove.sh @@ -53,7 +53,7 @@ function clean_bin() { } function clean_lib() { # Remove link - sudo rm -f ${lib_link_dir}/libtaos.so || : + sudo rm -f ${lib_link_dir}/libtaos.* || : #sudo rm -f /usr/lib/libtaos.so || : #sudo rm -rf ${lib_dir} || :