xxq250
/
homework-jianmu
1
0
Fork 0
Code Issues Pull Requests 1 Actions Packages Projects Releases Wiki Activity

Merge pull request #3 from guanshengliang/master 

Solve the installation script does not package taosdump error
This commit is contained in:
slguan 2019-07-11 18:19:09 +08:00 committed by GitHub
parent 57da318697 99c666aa49
commit 648091dec3
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
5 changed files with 9 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
packaging/deb/makedeb.sh
View File

@ -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

3
packaging/rpm/tdengine.spec
View File

@ -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

2
packaging/tools/post.sh
View File

@ -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 || :
}

3
packaging/tools/preun.sh
View File

@ -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 || :

4
packaging/tools/remove.sh
View File

@ -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} || :
}