diff --git a/packaging/tools/install.sh b/packaging/tools/install.sh index 5e554bb7d8..d844ce876e 100755 --- a/packaging/tools/install.sh +++ b/packaging/tools/install.sh @@ -37,6 +37,7 @@ demoName="${PREFIX}demo" xname="${PREFIX}x" explorerName="${PREFIX}-explorer" keeperName="${PREFIX}keeper" +inspect_name="${PREFIX}inspect" bin_link_dir="/usr/bin" lib_link_dir="/usr/lib" @@ -156,12 +157,13 @@ done #echo "verType=${verType} interactiveFqdn=${interactiveFqdn}" -tools=(${clientName} ${benchmarkName} ${dumpName} ${demoName} remove.sh taosudf set_core.sh TDinsight.sh start_pre.sh start-all.sh stop-all.sh) +tools=(${clientName} ${benchmarkName} ${dumpName} ${demoName} ${inspect_name} remove.sh taosudf set_core.sh TDinsight.sh start_pre.sh start-all.sh stop-all.sh) if [ "${verMode}" == "cluster" ]; then services=(${serverName} ${adapterName} ${xname} ${explorerName} ${keeperName}) elif [ "${verMode}" == "edge" ]; then if [ "${pagMode}" == "full" ]; then services=(${serverName} ${adapterName} ${keeperName} ${explorerName}) + tools=(${clientName} ${benchmarkName} ${dumpName} ${demoName} remove.sh taosudf set_core.sh TDinsight.sh start_pre.sh start-all.sh stop-all.sh) else services=(${serverName}) tools=(${clientName} ${benchmarkName} remove.sh start_pre.sh) @@ -225,6 +227,7 @@ function install_bin() { ${csudo}cp -r ${script_dir}/bin/${clientName} ${install_main_dir}/bin ${csudo}cp -r ${script_dir}/bin/${benchmarkName} ${install_main_dir}/bin ${csudo}cp -r ${script_dir}/bin/${dumpName} ${install_main_dir}/bin + ${csudo}cp -r ${script_dir}/bin/${inspect_name} ${install_main_dir}/bin ${csudo}cp -r ${script_dir}/bin/remove.sh ${install_main_dir}/bin else ${csudo}cp -r ${script_dir}/bin/* ${install_main_dir}/bin @@ -521,14 +524,14 @@ function local_fqdn_check() { function install_taosx_config() { [ ! -z $1 ] && return 0 || : # only install client - fileName="${script_dir}/${xname}/etc/${PREFIX}/${xname}.toml" - if [ -f ${fileName} ]; then - ${csudo}sed -i -r "s/#*\s*(fqdn\s*=\s*).*/\1\"${serverFqdn}\"/" ${fileName} + file_name="${script_dir}/${xname}/etc/${PREFIX}/${xname}.toml" + if [ -f ${file_name} ]; then + ${csudo}sed -i -r "s/#*\s*(fqdn\s*=\s*).*/\1\"${serverFqdn}\"/" ${file_name} if [ -f "${configDir}/${xname}.toml" ]; then - ${csudo}cp ${fileName} ${configDir}/${xname}.toml.new + ${csudo}cp ${file_name} ${configDir}/${xname}.toml.new else - ${csudo}cp ${fileName} ${configDir}/${xname}.toml + ${csudo}cp ${file_name} ${configDir}/${xname}.toml fi fi } @@ -538,18 +541,18 @@ function install_explorer_config() { [ ! -z $1 ] && return 0 || : # only install client if [ "$verMode" == "cluster" ]; then - fileName="${script_dir}/${xname}/etc/${PREFIX}/explorer.toml" + file_name="${script_dir}/${xname}/etc/${PREFIX}/explorer.toml" else - fileName="${script_dir}/cfg/explorer.toml" + file_name="${script_dir}/cfg/explorer.toml" fi - if [ -f ${fileName} ]; then - ${csudo}sed -i "s/localhost/${serverFqdn}/g" ${fileName} + if [ -f ${file_name} ]; then + ${csudo}sed -i "s/localhost/${serverFqdn}/g" ${file_name} if [ -f "${configDir}/explorer.toml" ]; then - ${csudo}cp ${fileName} ${configDir}/explorer.toml.new + ${csudo}cp ${file_name} ${configDir}/explorer.toml.new else - ${csudo}cp ${fileName} ${configDir}/explorer.toml + ${csudo}cp ${file_name} ${configDir}/explorer.toml fi fi } @@ -557,14 +560,14 @@ function install_explorer_config() { function install_adapter_config() { [ ! -z $1 ] && return 0 || : # only install client - fileName="${script_dir}/cfg/${adapterName}.toml" - if [ -f ${fileName} ]; then - ${csudo}sed -i -r "s/localhost/${serverFqdn}/g" ${fileName} + file_name="${script_dir}/cfg/${adapterName}.toml" + if [ -f ${file_name} ]; then + ${csudo}sed -i -r "s/localhost/${serverFqdn}/g" ${file_name} if [ -f "${configDir}/${adapterName}.toml" ]; then - ${csudo}cp ${fileName} ${configDir}/${adapterName}.toml.new + ${csudo}cp ${file_name} ${configDir}/${adapterName}.toml.new else - ${csudo}cp ${fileName} ${configDir}/${adapterName}.toml + ${csudo}cp ${file_name} ${configDir}/${adapterName}.toml fi fi } @@ -572,21 +575,21 @@ function install_adapter_config() { function install_keeper_config() { [ ! -z $1 ] && return 0 || : # only install client - fileName="${script_dir}/cfg/${keeperName}.toml" - if [ -f ${fileName} ]; then - ${csudo}sed -i -r "s/127.0.0.1/${serverFqdn}/g" ${fileName} + file_name="${script_dir}/cfg/${keeperName}.toml" + if [ -f ${file_name} ]; then + ${csudo}sed -i -r "s/127.0.0.1/${serverFqdn}/g" ${file_name} if [ -f "${configDir}/${keeperName}.toml" ]; then - ${csudo}cp ${fileName} ${configDir}/${keeperName}.toml.new + ${csudo}cp ${file_name} ${configDir}/${keeperName}.toml.new else - ${csudo}cp ${fileName} ${configDir}/${keeperName}.toml + ${csudo}cp ${file_name} ${configDir}/${keeperName}.toml fi fi } function install_taosd_config() { - fileName="${script_dir}/cfg/${configFile}" - if [ -f ${fileName} ]; then + file_name="${script_dir}/cfg/${configFile}" + if [ -f ${file_name} ]; then ${csudo}sed -i -r "s/#*\s*(fqdn\s*).*/\1$serverFqdn/" ${script_dir}/cfg/${configFile} ${csudo}echo "monitor 1" >>${script_dir}/cfg/${configFile} ${csudo}echo "monitorFQDN ${serverFqdn}" >>${script_dir}/cfg/${configFile} @@ -595,15 +598,27 @@ function install_taosd_config() { fi if [ -f "${configDir}/${configFile}" ]; then - ${csudo}cp ${fileName} ${configDir}/${configFile}.new + ${csudo}cp ${file_name} ${configDir}/${configFile}.new else - ${csudo}cp ${fileName} ${configDir}/${configFile} + ${csudo}cp ${file_name} ${configDir}/${configFile} fi fi ${csudo}ln -sf ${configDir}/${configFile} ${install_main_dir}/cfg } +function install_taosinspect_config() { + file_name="${script_dir}/cfg/inspect.cfg" + if [ -f ${file_name} ]; then + if [ -f "${configDir}/inspect.cfg" ]; then + ${csudo}cp ${file_name} ${configDir}/inspect.cfg.new + else + ${csudo}cp ${file_name} ${configDir}/inspect.cfg + fi + fi + + ${csudo}ln -sf ${configDir}/inspect.cfg ${install_main_dir}/cfg +} function install_config() { @@ -915,6 +930,10 @@ function updateProduct() { install_adapter_config install_taosx_config install_explorer_config + if [ "${verMode}" == "cluster" ]; then + install_taosinspect_config + fi + if [ "${verMode}" != "cloud" ]; then install_keeper_config fi @@ -1007,6 +1026,11 @@ function installProduct() { install_adapter_config install_taosx_config install_explorer_config + + if [ "${verMode}" == "cluster" ]; then + install_taosinspect_config + fi + if [ "${verMode}" != "cloud" ]; then install_keeper_config fi diff --git a/packaging/tools/install_client.sh b/packaging/tools/install_client.sh index 9ba9529146..532838fd2b 100755 --- a/packaging/tools/install_client.sh +++ b/packaging/tools/install_client.sh @@ -32,6 +32,8 @@ benchmarkName2="${clientName2}Benchmark" dumpName2="${clientName2}dump" demoName2="${clientName2}demo" uninstallScript2="rm${clientName2}" +inspect_name="${clientName2}inspect" + if [ "$osType" != "Darwin" ]; then script_dir=$(dirname $(readlink -f "$0")) @@ -106,12 +108,15 @@ function install_main_path() { function install_bin() { # Remove links - ${csudo}rm -f ${bin_link_dir}/${clientName} || : + ${csudo}rm -f ${bin_link_dir}/${clientName} || : if [ "$osType" != "Darwin" ]; then ${csudo}rm -f ${bin_link_dir}/taosdemo || : + ${csudo}rm -f ${bin_link_dir}/${inspect_name} || : fi - ${csudo}rm -f ${bin_link_dir}/${uninstallScript} || : - ${csudo}rm -f ${bin_link_dir}/set_core || : + ${csudo}rm -f ${bin_link_dir}/${uninstallScript} || : + ${csudo}rm -f ${bin_link_dir}/set_core || : + ${csudo}rm -f ${bin_link_dir}/${benchmarkName2} || : + ${csudo}rm -f ${bin_link_dir}/${dumpName2} || : ${csudo}cp -r ${script_dir}/bin/* ${install_main_dir}/bin && ${csudo}chmod 0555 ${install_main_dir}/bin/* @@ -119,6 +124,7 @@ function install_bin() { [ -x ${install_main_dir}/bin/${clientName2} ] && ${csudo}ln -s ${install_main_dir}/bin/${clientName2} ${bin_link_dir}/${clientName2} || : if [ "$osType" != "Darwin" ]; then [ -x ${install_main_dir}/bin/${demoName2} ] && ${csudo}ln -s ${install_main_dir}/bin/${demoName2} ${bin_link_dir}/${demoName2} || : + [ -x ${install_main_dir}/bin/${inspect_name} ] && ${csudo}ln -s ${install_main_dir}/bin/${inspect_name} ${bin_link_dir}/${inspect_name} || : fi [ -x ${install_main_dir}/bin/remove_client.sh ] && ${csudo}ln -s ${install_main_dir}/bin/remove_client.sh ${bin_link_dir}/${uninstallScript} || : [ -x ${install_main_dir}/bin/set_core.sh ] && ${csudo}ln -s ${install_main_dir}/bin/set_core.sh ${bin_link_dir}/set_core || : @@ -237,16 +243,34 @@ function install_jemalloc() { } function install_config() { - if [ ! -f ${cfg_install_dir}/${configFile} ]; then + file_name=${cfg_install_dir}/${configFile} + if [ -f ${file_name} ]; then + echo "The configuration file ${file_name} already exists" + ${csudo}cp ${file_name} ${cfg_install_dir}/${configFile}.new + else ${csudo}mkdir -p ${cfg_install_dir} [ -f ${script_dir}/cfg/${configFile} ] && ${csudo}cp ${script_dir}/cfg/${configFile} ${cfg_install_dir} ${csudo}chmod 644 ${cfg_install_dir}/* + ${csudo}ln -s ${cfg_install_dir}/${configFile} ${install_main_dir}/cfg fi - ${csudo}cp -f ${script_dir}/cfg/${configFile} ${install_main_dir}/cfg/${configFile}.org - ${csudo}ln -s ${cfg_install_dir}/${configFile} ${install_main_dir}/cfg + } +function install_taosinspect_config() { + file_name="${script_dir}/cfg/inspect.cfg" + if [ -f ${file_name} ]; then + if [ -f "${cfg_install_dir}/inspect.cfg" ]; then + ${csudo}cp ${file_name} ${cfg_install_dir}/inspect.cfg.new + else + ${csudo}mkdir -p ${cfg_install_dir} + ${csudo}cp ${file_name} ${cfg_install_dir}/inspect.cfg + fi + ${csudo}ln -sf ${cfg_install_dir}/inspect.cfg ${install_main_dir}/cfg + fi + + +} function install_log() { ${csudo}rm -rf ${log_dir} || : @@ -293,6 +317,7 @@ function update_TDengine() { install_jemalloc if [ "$verMode" == "cluster" ]; then install_connector + install_taosinspect_config fi install_examples install_bin @@ -320,6 +345,7 @@ function install_TDengine() { install_jemalloc if [ "$verMode" == "cluster" ]; then install_connector + install_taosinspect_config fi install_examples install_bin diff --git a/packaging/tools/remove.sh b/packaging/tools/remove.sh index b7bda31e13..621ed7f2a9 100755 --- a/packaging/tools/remove.sh +++ b/packaging/tools/remove.sh @@ -44,6 +44,7 @@ dumpName="${PREFIX}dump" keeperName="${PREFIX}keeper" xName="${PREFIX}x" explorerName="${PREFIX}-explorer" +inspect_name="${PREFIX}inspect" tarbitratorName="tarbitratord" productName="TDengine" @@ -58,10 +59,13 @@ config_dir="/etc/${PREFIX}" if [ "${verMode}" == "cluster" ]; then services=(${PREFIX}"d" ${PREFIX}"adapter" ${PREFIX}"keeper") + tools=(${PREFIX} ${PREFIX}"Benchmark" ${PREFIX}"dump" ${PREFIX}"demo" ${PREFIX}"inspect" taosudf set_core.sh TDinsight.sh $uninstallScript start-all.sh stop-all.sh) else + tools=(${PREFIX} ${PREFIX}"Benchmark" ${PREFIX}"dump" ${PREFIX}"demo" taosudf set_core.sh TDinsight.sh $uninstallScript start-all.sh stop-all.sh) + services=(${PREFIX}"d" ${PREFIX}"adapter" ${PREFIX}"keeper" ${PREFIX}"-explorer") fi -tools=(${PREFIX} ${PREFIX}"Benchmark" ${PREFIX}"dump" ${PREFIX}"demo" taosudf set_core.sh TDinsight.sh $uninstallScript start-all.sh stop-all.sh) + csudo="" if command -v sudo >/dev/null; then diff --git a/packaging/tools/remove_client.sh b/packaging/tools/remove_client.sh index 1d2965f66b..33454d7512 100755 --- a/packaging/tools/remove_client.sh +++ b/packaging/tools/remove_client.sh @@ -7,6 +7,7 @@ set -e RED='\033[0;31m' GREEN='\033[1;32m' NC='\033[0m' +verMode=edge installDir="/usr/local/taos" clientName="taos" @@ -18,8 +19,10 @@ productName2="TDengine" benchmarkName2="${clientName2}Benchmark" demoName2="${clientName2}demo" dumpName2="${clientName2}dump" +inspect_name="${clientName2}inspect" uninstallScript2="rm${clientName2}" + installDir="/usr/local/${clientName2}" #install main path @@ -52,8 +55,9 @@ function clean_bin() { ${csudo}rm -f ${bin_link_dir}/${demoName2} || : ${csudo}rm -f ${bin_link_dir}/${benchmarkName2} || : ${csudo}rm -f ${bin_link_dir}/${dumpName2} || : - ${csudo}rm -f ${bin_link_dir}/${uninstallScript} || : + ${csudo}rm -f ${bin_link_dir}/${uninstallScript2} || : ${csudo}rm -f ${bin_link_dir}/set_core || : + [ -f ${bin_link_dir}/${inspect_name} ] && ${csudo}rm -f ${bin_link_dir}/${inspect_name} || : if [ "$verMode" == "cluster" ] && [ "$clientName" != "$clientName2" ]; then ${csudo}rm -f ${bin_link_dir}/${clientName2} || : @@ -61,6 +65,7 @@ function clean_bin() { ${csudo}rm -f ${bin_link_dir}/${benchmarkName2} || : ${csudo}rm -f ${bin_link_dir}/${dumpName2} || : ${csudo}rm -f ${bin_link_dir}/${uninstallScript2} || : + [ -f ${bin_link_dir}/${inspect_name} ] && ${csudo}rm -f ${bin_link_dir}/${inspect_name} || : fi }