diff --git a/packaging/deb/makedeb.sh b/packaging/deb/makedeb.sh index c6076fcedc8a498419c18b7cafdb6e8163d21979..c5bc5953b4b260c66bfd65c626b469af34f6559a 100755 --- a/packaging/deb/makedeb.sh +++ b/packaging/deb/makedeb.sh @@ -26,6 +26,7 @@ cd ${pkg_dir} # create install dir 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 @@ -39,6 +40,7 @@ cp ${compile_dir}/../packaging/cfg/taos.cfg ${pkg_dir}${install_home_pat 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}/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 diff --git a/packaging/rpm/tdengine.spec b/packaging/rpm/tdengine.spec index fbcccc77557bcc5a85f53b8441ba2d630a1d091b..a92487d246f369ef58dd75cbb57d5d7c229ccd40 100644 --- a/packaging/rpm/tdengine.spec +++ b/packaging/rpm/tdengine.spec @@ -52,8 +52,9 @@ cp %{_compiledir}/../packaging/cfg/taos.cfg %{buildroot}%{homepath}/cfg 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}/build/bin/taosd %{buildroot}%{homepath}/bin 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}/../src/inc/taos.h %{buildroot}%{homepath}/include cp -r %{_compiledir}/../src/connector/grafana %{buildroot}%{homepath}/connector diff --git a/packaging/tools/post.sh b/packaging/tools/post.sh index 4483f1c7b089e6d4a4fe1d695ce29e044e507afc..2583d74275ed11020eccddc7dd15a8d14d5c6723 100755 --- a/packaging/tools/post.sh +++ b/packaging/tools/post.sh @@ -68,7 +68,7 @@ function install_bin() { #Make link [ -x ${bin_dir}/taos ] && sudo ln -s ${bin_dir}/taos ${bin_link_dir}/taos || : [ -x ${bin_dir}/taosd ] && sudo ln -s ${bin_dir}/taosd ${bin_link_dir}/taosd || : -# [ -x ${bin_dir}/taosdump ] && sudo ln -s ${bin_dir}/taosdump ${bin_link_dir}/taosdump || : + [ -x ${bin_dir}/taosdump ] && sudo ln -s ${bin_dir}/taosdump ${bin_link_dir}/taosdump || : # [ -x ${bin_dir}/remove.sh ] && sudo ln -s ${bin_dir}/remove.sh ${bin_link_dir}/rmtaos || : } diff --git a/packaging/tools/preun.sh b/packaging/tools/preun.sh index 387829bb4432223b7a8b8a72f6e448943fab2eb8..ed1ee675cbab8fac5e9147fd7331f5d71bef28d4 100755 --- a/packaging/tools/preun.sh +++ b/packaging/tools/preun.sh @@ -69,7 +69,8 @@ clean_service # Remove all links sudo rm -f ${bin_link_dir}/taos || : sudo rm -f ${bin_link_dir}/taosd || : -sudo rm -f ${cfg_link_dir}/taos.cfg || : +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 || : diff --git a/packaging/tools/remove.sh b/packaging/tools/remove.sh index 0dc9b92258748ff7a7543a62f8fd1c06e586d198..c5851f46811fcb69be39f17ebb6313833596cd1a 100755 --- a/packaging/tools/remove.sh +++ b/packaging/tools/remove.sh @@ -61,14 +61,14 @@ function clean_lib() { function clean_header() { # Remove link - sudo rm -f ${inc_link_dir}/taos.h || : + sudo rm -f ${inc_link_dir}/taos.h || : #sudo rm -rf ${header_dir} } function clean_config() { # Remove link - sudo rm -f ${cfg_link_dir}/taos.cfg || : + sudo rm -f ${cfg_link_dir}/* || : #sudo rm -rf ${cfg_link_dir} || : }