Skip to content

Commit

Permalink
fix: install script cleanup for2.4 (#11863)
Browse files Browse the repository at this point in the history
* [TD-12810]<fix>(other): install script cleanup

for 2.4

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

fix make_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

* fix: don't create connector directory

[TD-12810]
  • Loading branch information
sangshuduo authored Apr 26, 2022
1 parent 3897e55 commit 1390bdc
Show file tree
Hide file tree
Showing 2 changed files with 16 additions and 16 deletions.
2 changes: 1 addition & 1 deletion packaging/tools/install_client.sh
Original file line number Diff line number Diff line change
Expand Up @@ -85,7 +85,7 @@ function install_main_path() {
${csudo}mkdir -p ${install_main_dir}/bin
${csudo}mkdir -p ${install_main_dir}/driver
if [ $productName == "TDengine" ]; then
${csudo}mkdir -p ${install_main_dir}/connector
# ${csudo}mkdir -p ${install_main_dir}/connector
${csudo}mkdir -p ${install_main_dir}/examples
fi
${csudo}mkdir -p ${install_main_dir}/include
Expand Down
30 changes: 15 additions & 15 deletions packaging/tools/makeclient.sh
Original file line number Diff line number Diff line change
Expand Up @@ -148,21 +148,21 @@ if [[ $productName == "TDengine" ]]; then
mkdir -p ${install_dir}/examples/taosbenchmark-json && cp ${examples_dir}/../src/kit/taos-tools/example/* ${install_dir}/examples/taosbenchmark-json
fi

# Copy connector
connector_dir="${code_dir}/connector"
mkdir -p ${install_dir}/connector
if [[ "$pagMode" != "lite" ]] && [[ "$cpuType" != "aarch32" ]]; then
if [ "$osType" != "Darwin" ]; then
cp ${build_dir}/lib/*.jar ${install_dir}/connector || :
fi
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 connector
# connector_dir="${code_dir}/connector"
# mkdir -p ${install_dir}/connector
# if [[ "$pagMode" != "lite" ]] && [[ "$cpuType" != "aarch32" ]]; then
# if [ "$osType" != "Darwin" ]; then
# cp ${build_dir}/lib/*.jar ${install_dir}/connector || :
# fi
# 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
fi

# Copy driver
Expand Down

0 comments on commit 1390bdc

Please sign in to comment.