diff --git a/packaging/deb/DEBIAN/postinst b/packaging/deb/DEBIAN/postinst index 08f3e513c7cfc221a7f278ef6997dcb039da3eef..556e757c2bfced34c43283c0de39baaacb95003f 100644 --- a/packaging/deb/DEBIAN/postinst +++ b/packaging/deb/DEBIAN/postinst @@ -2,6 +2,12 @@ #set -x #path=`pwd` insmetaPath="/usr/local/taos/script" -sudo chmod -R 744 ${insmetaPath} + +csudo="" +if command -v sudo > /dev/null; then + csudo="sudo" +fi + +${csudo} chmod -R 744 ${insmetaPath} cd ${insmetaPath} -sudo ./post.sh +${csudo} ./post.sh diff --git a/packaging/deb/DEBIAN/preinst b/packaging/deb/DEBIAN/preinst index 88b76568df486c12e0ed5c6936a6057a27291ad5..d31129ba2cbe7d3d2d41dc0176e4a3bd43bde60d 100644 --- a/packaging/deb/DEBIAN/preinst +++ b/packaging/deb/DEBIAN/preinst @@ -1,5 +1,10 @@ #!/bin/bash +csudo="" +if command -v sudo > /dev/null; then + csudo="sudo" +fi + function is_using_systemd() { if pidof systemd &> /dev/null; then return 0 @@ -11,9 +16,9 @@ function is_using_systemd() { # Stop the service if running if pidof taosd &> /dev/null; then if is_using_systemd; then - sudo systemctl stop taosd || : + ${csudo} systemctl stop taosd || : else - sudo service taosd stop || : + ${csudo} service taosd stop || : fi echo "Stop taosd service success!" sleep 1 @@ -23,6 +28,6 @@ fi cfg_install_dir="/etc/taos" install_main_dir="/usr/local/taos" if [ -f ${cfg_install_dir}/taos.cfg ]; then - sudo rm -f ${install_main_dir}/cfg/taos.cfg || : + ${csudo} rm -f ${install_main_dir}/cfg/taos.cfg || : fi diff --git a/packaging/deb/DEBIAN/prerm b/packaging/deb/DEBIAN/prerm index 943c02948ba261a1f92d8a7b8356a80c0212961c..e5a7c027a30ba1a7790e25ad03999462a6bdf30d 100644 --- a/packaging/deb/DEBIAN/prerm +++ b/packaging/deb/DEBIAN/prerm @@ -1,9 +1,12 @@ #!/bin/bash -#path=`pwd` insmetaPath="/usr/local/taos/script" -cd ${insmetaPath} -#sudo chmod -R 744 ${insmetaPath} -sudo ./preun.sh +csudo="" +if command -v sudo > /dev/null; then + csudo="sudo" +fi +${csudo} chmod -R 744 ${insmetaPath} +cd ${insmetaPath} +${csudo} ./preun.sh diff --git a/packaging/release.sh b/packaging/release.sh index c9666e86ea1600941fdf71516b22b0fb5fcaed44..296c50daa2268389612759e2953e071d73c07fec 100755 --- a/packaging/release.sh +++ b/packaging/release.sh @@ -10,6 +10,11 @@ script_dir="$(dirname $(readlink -f $0))" top_dir="$(readlink -m ${script_dir}/..)" versioninfo="${top_dir}/src/util/src/version.c" +csudo="" +if command -v sudo > /dev/null; then + csudo="sudo" +fi + function is_valid_version() { [ -z $1 ] && return 1 || : @@ -113,13 +118,13 @@ fi compile_dir="${top_dir}/${compile_mode}" if [ -d ${compile_dir} ]; then - rm -rf ${compile_dir} + ${csudo} rm -rf ${compile_dir} fi -mkdir -p ${compile_dir} +${csudo} mkdir -p ${compile_dir} cd ${compile_dir} -cmake -DCMAKE_BUILD_TYPE=${compile_mode} ${top_dir} -make +${csudo} cmake -DCMAKE_BUILD_TYPE=${compile_mode} ${top_dir} +${csudo} make cd ${curr_dir} @@ -132,29 +137,29 @@ if echo $osinfo | grep -qwi "ubuntu" ; then echo "this is ubuntu system" output_dir="${top_dir}/debs" if [ -d ${output_dir} ]; then - rm -rf ${output_dir} + ${csudo} rm -rf ${output_dir} fi - mkdir -p ${output_dir} + ${csudo} mkdir -p ${output_dir} cd ${script_dir}/deb - ./makedeb.sh ${compile_dir} ${output_dir} ${version} + ${csudo} ./makedeb.sh ${compile_dir} ${output_dir} ${version} elif echo $osinfo | grep -qwi "centos" ; then echo "this is centos system" output_dir="${top_dir}/rpms" if [ -d ${output_dir} ]; then - rm -rf ${output_dir} + ${csudo} rm -rf ${output_dir} fi - mkdir -p ${output_dir} + ${csudo} mkdir -p ${output_dir} cd ${script_dir}/rpm - ./makerpm.sh ${compile_dir} ${output_dir} ${version} + ${csudo} ./makerpm.sh ${compile_dir} ${output_dir} ${version} else echo "this is other linux system" fi cd ${script_dir}/tools -./makepkg.sh ${compile_dir} ${version} "${build_time}" +${csudo} ./makepkg.sh ${compile_dir} ${version} "${build_time}" # 4. Clean up temporary compile directories -#rm -rf ${compile_dir} +#${csudo} rm -rf ${compile_dir} diff --git a/packaging/rpm/makerpm.sh b/packaging/rpm/makerpm.sh index 3950511080080f91c5df84cf1d2df727c06e1974..3b0f1d098ee580f4651832300dad58ec18e07e7f 100755 --- a/packaging/rpm/makerpm.sh +++ b/packaging/rpm/makerpm.sh @@ -19,18 +19,23 @@ echo "compile_dir: ${compile_dir}" echo "pkg_dir: ${pkg_dir}" echo "spec_file: ${spec_file}" +csudo="" +if command -v sudo > /dev/null; then + csudo="sudo" +fi + if [ -d ${pkg_dir} ]; then - rm -rf ${pkg_dir} + ${csudo} rm -rf ${pkg_dir} fi -mkdir -p ${pkg_dir} +${csudo} mkdir -p ${pkg_dir} cd ${pkg_dir} -mkdir -p BUILD BUILDROOT RPMS SOURCES SPECS SRPMS +${csudo} mkdir -p BUILD BUILDROOT RPMS SOURCES SPECS SRPMS -rpmbuild --define="_version ${tdengine_ver}" --define="_topdir ${pkg_dir}" --define="_compiledir ${compile_dir}" -bb ${spec_file} +${csudo} rpmbuild --define="_version ${tdengine_ver}" --define="_topdir ${pkg_dir}" --define="_compiledir ${compile_dir}" -bb ${spec_file} # copy rpm package to output_dir, then clean temp dir #echo "rmpbuild end, cur_dir: $(pwd) " -cp -rf RPMS/* ${output_dir} +${csudo} cp -rf RPMS/* ${output_dir} cd .. -rm -rf ${pkg_dir} +${csudo} rm -rf ${pkg_dir} diff --git a/packaging/rpm/tdengine.spec b/packaging/rpm/tdengine.spec index 04d79b217250910eb9446e9233165c58c97f2cca..6ba90531e41979c93e2720eb126f62fbf4585787 100644 --- a/packaging/rpm/tdengine.spec +++ b/packaging/rpm/tdengine.spec @@ -76,12 +76,17 @@ function is_using_systemd() { fi } +csudo="" +if command -v sudo > /dev/null; then + csudo="sudo" +fi + # Stop the service if running if pidof taosd &> /dev/null; then if is_using_systemd; then - sudo systemctl stop taosd || : + ${csudo} systemctl stop taosd || : else - sudo service taosd stop || : + ${csudo} service taosd stop || : fi echo "Stop taosd service success!" sleep 1 @@ -89,20 +94,28 @@ fi # if taos.cfg already softlink, remove it if [ -f %{cfg_install_dir}/taos.cfg ]; then - sudo rm -f %{homepath}/cfg/taos.cfg || : + ${csudo} rm -f %{homepath}/cfg/taos.cfg || : fi #Scripts executed after installation %post +csudo="" +if command -v sudo > /dev/null; then + csudo="sudo" +fi cd %{homepath}/script -sudo ./post.sh +${csudo} ./post.sh # Scripts executed before uninstall %preun +csudo="" +if command -v sudo > /dev/null; then + csudo="sudo" +fi # only remove package to call preun.sh, not but update(2) if [ $1 -eq 0 ];then cd %{homepath}/script - sudo ./preun.sh + ${csudo} ./preun.sh fi # Scripts executed after uninstall @@ -110,14 +123,17 @@ fi # clean build dir %clean -rm -rf %{buildroot} +csudo="" +if command -v sudo > /dev/null; then + csudo="sudo" +fi +${csudo} rm -rf %{buildroot} #Specify the files to be packaged %files /* #%doc - #Setting default permissions %defattr (-,root,root,0755) #%{prefix} diff --git a/packaging/tools/install.sh b/packaging/tools/install.sh index 1883493dbcb2c5497527e9a67c6d83d8f0c66abf..bda72eda3c43e949f1793a14055b4de5d39e0c3e 100755 --- a/packaging/tools/install.sh +++ b/packaging/tools/install.sh @@ -36,106 +36,114 @@ GREEN_DARK='\033[0;32m' GREEN_UNDERLINE='\033[4;32m' NC='\033[0m' -function is_using_systemd() { - if pidof systemd &> /dev/null; then - return 0 - else - return 1 - fi -} +csudo="" +if command -v sudo > /dev/null; then + csudo="sudo" +fi -if ! is_using_systemd; then +service_mod=2 +if pidof systemd &> /dev/null; then + service_mod=0 +elif $(which update-rc.d &> /dev/null); then + service_mod=1 service_config_dir="/etc/init.d" +else + service_mod=2 fi +function kill_taosd() { + pid=$(ps -ef | grep "taosd" | grep -v "grep" | awk '{print $2}') + ${csudo} kill -9 pid || : +} + function install_main_path() { #create install main dir and all sub dir - sudo rm -rf ${install_main_dir} || : - sudo mkdir -p ${install_main_dir} - sudo mkdir -p ${install_main_dir}/cfg - sudo mkdir -p ${install_main_dir}/bin - sudo mkdir -p ${install_main_dir}/connector - sudo mkdir -p ${install_main_dir}/driver - sudo mkdir -p ${install_main_dir}/examples - sudo mkdir -p ${install_main_dir}/include - sudo mkdir -p ${install_main_dir}/init.d + ${csudo} rm -rf ${install_main_dir} || : + ${csudo} mkdir -p ${install_main_dir} + ${csudo} mkdir -p ${install_main_dir}/cfg + ${csudo} mkdir -p ${install_main_dir}/bin + ${csudo} mkdir -p ${install_main_dir}/connector + ${csudo} mkdir -p ${install_main_dir}/driver + ${csudo} mkdir -p ${install_main_dir}/examples + ${csudo} mkdir -p ${install_main_dir}/include + ${csudo} mkdir -p ${install_main_dir}/init.d } function install_bin() { # Remove links - sudo rm -f ${bin_link_dir}/taos || : - sudo rm -f ${bin_link_dir}/taosd || : - sudo rm -f ${bin_link_dir}/taosdump || : - sudo rm -f ${bin_link_dir}/rmtaos || : + ${csudo} rm -f ${bin_link_dir}/taos || : + ${csudo} rm -f ${bin_link_dir}/taosd || : + ${csudo} rm -f ${bin_link_dir}/taosdump || : + ${csudo} rm -f ${bin_link_dir}/rmtaos || : - sudo cp -r ${script_dir}/bin/* ${install_main_dir}/bin && sudo chmod 0555 ${install_main_dir}/bin/* + ${csudo} cp -r ${script_dir}/bin/* ${install_main_dir}/bin && ${csudo} chmod 0555 ${install_main_dir}/bin/* #Make link - [ -x ${install_main_dir}/bin/taos ] && sudo ln -s ${install_main_dir}/bin/taos ${bin_link_dir}/taos || : - [ -x ${install_main_dir}/bin/taosd ] && sudo ln -s ${install_main_dir}/bin/taosd ${bin_link_dir}/taosd || : - [ -x ${install_main_dir}/bin/taosdump ] && sudo ln -s ${install_main_dir}/bin/taosdump ${bin_link_dir}/taosdump || : - [ -x ${install_main_dir}/bin/remove.sh ] && sudo ln -s ${install_main_dir}/bin/remove.sh ${bin_link_dir}/rmtaos || : + [ -x ${install_main_dir}/bin/taos ] && ${csudo} ln -s ${install_main_dir}/bin/taos ${bin_link_dir}/taos || : + [ -x ${install_main_dir}/bin/taosd ] && ${csudo} ln -s ${install_main_dir}/bin/taosd ${bin_link_dir}/taosd || : + [ -x ${install_main_dir}/bin/taosdump ] && ${csudo} ln -s ${install_main_dir}/bin/taosdump ${bin_link_dir}/taosdump || : + [ -x ${install_main_dir}/bin/remove.sh ] && ${csudo} ln -s ${install_main_dir}/bin/remove.sh ${bin_link_dir}/rmtaos || : } function install_lib() { # Remove links - sudo rm -f ${lib_link_dir}/libtaos.* || : + ${csudo} rm -f ${lib_link_dir}/libtaos.* || : - sudo cp -rf ${script_dir}/driver/* ${install_main_dir}/driver && sudo chmod 777 ${install_main_dir}/driver/* + ${csudo} cp -rf ${script_dir}/driver/* ${install_main_dir}/driver && ${csudo} chmod 777 ${install_main_dir}/driver/* - 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 + ${csudo} ln -s ${install_main_dir}/driver/libtaos.* ${lib_link_dir}/libtaos.so.1 + ${csudo} ln -s ${lib_link_dir}/libtaos.so.1 ${lib_link_dir}/libtaos.so } function install_header() { - sudo rm -f ${inc_link_dir}/taos.h || : - sudo cp -f ${script_dir}/inc/* ${install_main_dir}/include && sudo chmod 644 ${install_main_dir}/include/* - sudo ln -s ${install_main_dir}/include/taos.h ${inc_link_dir}/taos.h + ${csudo} rm -f ${inc_link_dir}/taos.h || : + ${csudo} cp -f ${script_dir}/inc/* ${install_main_dir}/include && ${csudo} chmod 644 ${install_main_dir}/include/* + ${csudo} ln -s ${install_main_dir}/include/taos.h ${inc_link_dir}/taos.h } function install_config() { - #sudo rm -f ${install_main_dir}/cfg/taos.cfg || : + #${csudo} rm -f ${install_main_dir}/cfg/taos.cfg || : if [ ! -f ${cfg_install_dir}/taos.cfg ]; then - sudo sudo mkdir -p ${cfg_install_dir} - [ -f ${script_dir}/cfg/taos.cfg ] && sudo cp ${script_dir}/cfg/taos.cfg ${cfg_install_dir} - sudo chmod 644 ${cfg_install_dir}/* + ${csudo} mkdir -p ${cfg_install_dir} + [ -f ${script_dir}/cfg/taos.cfg ] && ${csudo} cp ${script_dir}/cfg/taos.cfg ${cfg_install_dir} + ${csudo} chmod 644 ${cfg_install_dir}/* fi - sudo cp -f ${script_dir}/cfg/taos.cfg ${install_main_dir}/cfg/taos.cfg.org - sudo ln -s ${cfg_install_dir}/taos.cfg ${install_main_dir}/cfg + ${csudo} cp -f ${script_dir}/cfg/taos.cfg ${install_main_dir}/cfg/taos.cfg.org + ${csudo} ln -s ${cfg_install_dir}/taos.cfg ${install_main_dir}/cfg } function install_log() { - sudo rm -rf ${log_dir} || : - sudo mkdir -p ${log_dir} && sudo chmod 777 ${log_dir} + ${csudo} rm -rf ${log_dir} || : + ${csudo} mkdir -p ${log_dir} && ${csudo} chmod 777 ${log_dir} - sudo ln -s ${log_dir} ${install_main_dir}/log + ${csudo} ln -s ${log_dir} ${install_main_dir}/log } function install_data() { - sudo mkdir -p ${data_dir} + ${csudo} mkdir -p ${data_dir} - sudo ln -s ${data_dir} ${install_main_dir}/data + ${csudo} ln -s ${data_dir} ${install_main_dir}/data } function install_connector() { - sudo cp -rf ${script_dir}/connector/* ${install_main_dir}/connector + ${csudo} cp -rf ${script_dir}/connector/* ${install_main_dir}/connector } function install_examples() { - sudo cp -rf ${script_dir}/examples/* ${install_main_dir}/examples + ${csudo} cp -rf ${script_dir}/examples/* ${install_main_dir}/examples } function clean_service_on_sysvinit() { restart_config_str="taos:2345:respawn:${service_config_dir}/taosd start" if pidof taosd &> /dev/null; then - sudo service taosd stop || : + ${csudo} service taosd stop || : fi - sudo sed -i "\|${restart_config_str}|d" /etc/inittab || : - sudo rm -f ${service_config_dir}/taosd || : - sudo update-rc.d -f taosd remove || : - sudo init q || : + ${csudo} sed -i "\|${restart_config_str}|d" /etc/inittab || : + ${csudo} rm -f ${service_config_dir}/taosd || : + ${csudo} update-rc.d -f taosd remove || : + ${csudo} init q || : } function install_service_on_sysvinit() { @@ -144,13 +152,13 @@ function install_service_on_sysvinit() { sleep 1 # Install taosd service - sudo cp -f ${script_dir}/init.d/taosd ${install_main_dir}/init.d - sudo cp ${script_dir}/init.d/taosd ${service_config_dir} && sudo chmod a+x ${service_config_dir}/taosd + ${csudo} cp -f ${script_dir}/init.d/taosd ${install_main_dir}/init.d + ${csudo} cp ${script_dir}/init.d/taosd ${service_config_dir} && ${csudo} chmod a+x ${service_config_dir}/taosd restart_config_str="taos:2345:respawn:${service_config_dir}/taosd start" - sudo grep -q -F "$restart_config_str" /etc/inittab || sudo bash -c "echo '${restart_config_str}' >> /etc/inittab" + ${csudo} grep -q -F "$restart_config_str" /etc/inittab || ${csudo} bash -c "echo '${restart_config_str}' >> /etc/inittab" # TODO: for centos, change here - sudo update-rc.d taosd defaults + ${csudo} update-rc.d taosd defaults # chkconfig mysqld on } @@ -159,11 +167,11 @@ function clean_service_on_systemd() { if systemctl is-active --quiet taosd; then echo "TDengine is running, stopping it..." - sudo systemctl stop taosd &> /dev/null || echo &> /dev/null + ${csudo} systemctl stop taosd &> /dev/null || echo &> /dev/null fi - sudo systemctl disable taosd &> /dev/null || echo &> /dev/null + ${csudo} systemctl disable taosd &> /dev/null || echo &> /dev/null - sudo rm -f ${taosd_service_config} + ${csudo} rm -f ${taosd_service_config} } # taos:2345:respawn:/etc/init.d/taosd start @@ -173,33 +181,36 @@ function install_service_on_systemd() { taosd_service_config="${service_config_dir}/taosd.service" - sudo bash -c "echo '[Unit]' >> ${taosd_service_config}" - sudo bash -c "echo 'Description=TDengine server service' >> ${taosd_service_config}" - sudo bash -c "echo 'After=network-online.target' >> ${taosd_service_config}" - sudo bash -c "echo 'Wants=network-online.target' >> ${taosd_service_config}" - sudo bash -c "echo >> ${taosd_service_config}" - sudo bash -c "echo '[Service]' >> ${taosd_service_config}" - sudo bash -c "echo 'Type=simple' >> ${taosd_service_config}" - sudo bash -c "echo 'ExecStart=/usr/bin/taosd' >> ${taosd_service_config}" - sudo bash -c "echo 'LimitNOFILE=infinity' >> ${taosd_service_config}" - sudo bash -c "echo 'LimitNPROC=infinity' >> ${taosd_service_config}" - sudo bash -c "echo 'LimitCORE=infinity' >> ${taosd_service_config}" - sudo bash -c "echo 'TimeoutStartSec=0' >> ${taosd_service_config}" - sudo bash -c "echo 'StandardOutput=null' >> ${taosd_service_config}" - sudo bash -c "echo 'Restart=always' >> ${taosd_service_config}" - sudo bash -c "echo 'StartLimitBurst=3' >> ${taosd_service_config}" - sudo bash -c "echo 'StartLimitInterval=60s' >> ${taosd_service_config}" - sudo bash -c "echo >> ${taosd_service_config}" - sudo bash -c "echo '[Install]' >> ${taosd_service_config}" - sudo bash -c "echo 'WantedBy=multi-user.target' >> ${taosd_service_config}" - sudo systemctl enable taosd + ${csudo} bash -c "echo '[Unit]' >> ${taosd_service_config}" + ${csudo} bash -c "echo 'Description=TDengine server service' >> ${taosd_service_config}" + ${csudo} bash -c "echo 'After=network-online.target' >> ${taosd_service_config}" + ${csudo} bash -c "echo 'Wants=network-online.target' >> ${taosd_service_config}" + ${csudo} bash -c "echo >> ${taosd_service_config}" + ${csudo} bash -c "echo '[Service]' >> ${taosd_service_config}" + ${csudo} bash -c "echo 'Type=simple' >> ${taosd_service_config}" + ${csudo} bash -c "echo 'ExecStart=/usr/bin/taosd' >> ${taosd_service_config}" + ${csudo} bash -c "echo 'LimitNOFILE=infinity' >> ${taosd_service_config}" + ${csudo} bash -c "echo 'LimitNPROC=infinity' >> ${taosd_service_config}" + ${csudo} bash -c "echo 'LimitCORE=infinity' >> ${taosd_service_config}" + ${csudo} bash -c "echo 'TimeoutStartSec=0' >> ${taosd_service_config}" + ${csudo} bash -c "echo 'StandardOutput=null' >> ${taosd_service_config}" + ${csudo} bash -c "echo 'Restart=always' >> ${taosd_service_config}" + ${csudo} bash -c "echo 'StartLimitBurst=3' >> ${taosd_service_config}" + ${csudo} bash -c "echo 'StartLimitInterval=60s' >> ${taosd_service_config}" + ${csudo} bash -c "echo >> ${taosd_service_config}" + ${csudo} bash -c "echo '[Install]' >> ${taosd_service_config}" + ${csudo} bash -c "echo 'WantedBy=multi-user.target' >> ${taosd_service_config}" + ${csudo} systemctl enable taosd } function install_service() { - if is_using_systemd; then + if ((${service_mod}==0)); then install_service_on_systemd - else + elif ((${service_mod}==1)); then install_service_on_sysvinit + else + # must manual start taosd + kill_taosd fi } @@ -263,10 +274,12 @@ function update_TDengine() { echo -e "${GREEN}Start to update TDEngine...${NC}" # Stop the service if running if pidof taosd &> /dev/null; then - if is_using_systemd; then - sudo systemctl stop taosd || : + if ((${service_mod}==0)); then + ${csudo} systemctl stop taosd || : + elif ((${service_mod}==1)); then + ${csudo} service taosd stop || : else - sudo service taosd stop || : + kill_taosd fi sleep 1 fi @@ -287,11 +300,13 @@ 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}" + if ((${service_mod}==0)); then + echo -e "${GREEN_DARK}To start TDengine ${NC}: ${csudo} systemctl start taosd${NC}" + elif ((${service_mod}==1)); then + echo -e "${GREEN_DARK}To start TDengine ${NC}: ${csudo} update-rc.d taosd default ${RED} for the first time${NC}" + echo -e " : ${csudo} service taosd start ${RED} after${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}" + echo -e "${GREEN_DARK}To start TDengine ${NC}: ./taosd${NC}" fi echo -e "${GREEN_DARK}To access TDengine ${NC}: use ${GREEN_UNDERLINE}taos${NC} in shell${NC}" @@ -341,11 +356,13 @@ 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}" + if ((${service_mod}==0)); then + echo -e "${GREEN_DARK}To start TDengine ${NC}: ${csudo} systemctl start taosd${NC}" + elif ((${service_mod}==1)); then + echo -e "${GREEN_DARK}To start TDengine ${NC}: ${csudo} update-rc.d taosd default ${RED} for the first time${NC}" + echo -e " : ${csudo} service taosd start ${RED} after${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}" + echo -e "${GREEN_DARK}To start TDengine ${NC}: ./taosd${NC}" fi echo -e "${GREEN_DARK}To access TDengine ${NC}: use ${GREEN_UNDERLINE}taos${NC} in shell${NC}" diff --git a/packaging/tools/make_install.sh b/packaging/tools/make_install.sh index 1eb62da79f8408f4dccf7c0a5c7e752f128f8643..d8f0d7eab3b8d29fb3854ab9a548fe25fd127049 100755 --- a/packaging/tools/make_install.sh +++ b/packaging/tools/make_install.sh @@ -38,6 +38,11 @@ GREEN_DARK='\033[0;32m' GREEN_UNDERLINE='\033[4;32m' NC='\033[0m' +csudo="" +if command -v sudo > /dev/null; then + csudo="sudo" +fi + function is_using_systemd() { if pidof systemd &> /dev/null; then return 0 @@ -52,100 +57,100 @@ fi function install_main_path() { #create install main dir and all sub dir - sudo rm -rf ${install_main_dir} || : - sudo mkdir -p ${install_main_dir} - sudo mkdir -p ${install_main_dir}/cfg - sudo mkdir -p ${install_main_dir}/bin - sudo mkdir -p ${install_main_dir}/connector - sudo mkdir -p ${install_main_dir}/driver - sudo mkdir -p ${install_main_dir}/examples - sudo mkdir -p ${install_main_dir}/include - sudo mkdir -p ${install_main_dir}/init.d + ${csudo} rm -rf ${install_main_dir} || : + ${csudo} mkdir -p ${install_main_dir} + ${csudo} mkdir -p ${install_main_dir}/cfg + ${csudo} mkdir -p ${install_main_dir}/bin + ${csudo} mkdir -p ${install_main_dir}/connector + ${csudo} mkdir -p ${install_main_dir}/driver + ${csudo} mkdir -p ${install_main_dir}/examples + ${csudo} mkdir -p ${install_main_dir}/include + ${csudo} mkdir -p ${install_main_dir}/init.d } function install_bin() { # Remove links - sudo rm -f ${bin_link_dir}/taos || : - sudo rm -f ${bin_link_dir}/taosd || : - sudo rm -f ${bin_link_dir}/taosdump || : - sudo rm -f ${bin_link_dir}/rmtaos || : + ${csudo} rm -f ${bin_link_dir}/taos || : + ${csudo} rm -f ${bin_link_dir}/taosd || : + ${csudo} rm -f ${bin_link_dir}/taosdump || : + ${csudo} rm -f ${bin_link_dir}/rmtaos || : - sudo cp -r ${binary_dir}/build/bin/taos ${install_main_dir}/bin - sudo cp -r ${binary_dir}/build/bin/taosd ${install_main_dir}/bin - sudo cp -r ${binary_dir}/build/bin/taosdump ${install_main_dir}/bin - sudo cp -r ${script_dir}/remove.sh ${install_main_dir}/bin - sudo chmod 0555 ${install_main_dir}/bin/* + ${csudo} cp -r ${binary_dir}/build/bin/taos ${install_main_dir}/bin + ${csudo} cp -r ${binary_dir}/build/bin/taosd ${install_main_dir}/bin + ${csudo} cp -r ${binary_dir}/build/bin/taosdump ${install_main_dir}/bin + ${csudo} cp -r ${script_dir}/remove.sh ${install_main_dir}/bin + ${csudo} chmod 0555 ${install_main_dir}/bin/* #Make link - [ -x ${install_main_dir}/bin/taos ] && sudo ln -s ${install_main_dir}/bin/taos ${bin_link_dir}/taos || : - [ -x ${install_main_dir}/bin/taosd ] && sudo ln -s ${install_main_dir}/bin/taosd ${bin_link_dir}/taosd || : - [ -x ${install_main_dir}/bin/taosdump ] && sudo ln -s ${install_main_dir}/bin/taosdump ${bin_link_dir}/taosdump || : - [ -x ${install_main_dir}/bin/remove.sh ] && sudo ln -s ${install_main_dir}/bin/remove.sh ${bin_link_dir}/rmtaos || : + [ -x ${install_main_dir}/bin/taos ] && ${csudo} ln -s ${install_main_dir}/bin/taos ${bin_link_dir}/taos || : + [ -x ${install_main_dir}/bin/taosd ] && ${csudo} ln -s ${install_main_dir}/bin/taosd ${bin_link_dir}/taosd || : + [ -x ${install_main_dir}/bin/taosdump ] && ${csudo} ln -s ${install_main_dir}/bin/taosdump ${bin_link_dir}/taosdump || : + [ -x ${install_main_dir}/bin/remove.sh ] && ${csudo} ln -s ${install_main_dir}/bin/remove.sh ${bin_link_dir}/rmtaos || : } function install_lib() { # Remove links - sudo rm -f ${lib_link_dir}/libtaos.so || : + ${csudo} rm -f ${lib_link_dir}/libtaos.so || : 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} ${lib_link_dir}/libtaos.so.1 - sudo ln -sf ${lib_link_dir}/libtaos.so.1 ${lib_link_dir}/libtaos.so + ${csudo} cp ${binary_dir}/build/lib/libtaos.so.${versioninfo} ${install_main_dir}/driver && ${csudo} chmod 777 ${install_main_dir}/driver/* + ${csudo} ln -sf ${install_main_dir}/driver/libtaos.so.${versioninfo} ${lib_link_dir}/libtaos.so.1 + ${csudo} ln -sf ${lib_link_dir}/libtaos.so.1 ${lib_link_dir}/libtaos.so } function install_header() { - sudo rm -f ${inc_link_dir}/taos.h || : - sudo cp -f ${source_dir}/src/inc/taos.h ${install_main_dir}/include && sudo chmod 644 ${install_main_dir}/include/* - sudo ln -s ${install_main_dir}/include/taos.h ${inc_link_dir}/taos.h + ${csudo} rm -f ${inc_link_dir}/taos.h || : + ${csudo} cp -f ${source_dir}/src/inc/taos.h ${install_main_dir}/include && ${csudo} chmod 644 ${install_main_dir}/include/* + ${csudo} ln -s ${install_main_dir}/include/taos.h ${inc_link_dir}/taos.h } function install_config() { - #sudo rm -f ${install_main_dir}/cfg/taos.cfg || : + #${csudo} rm -f ${install_main_dir}/cfg/taos.cfg || : if [ ! -f ${cfg_install_dir}/taos.cfg ]; then - sudo sudo mkdir -p ${cfg_install_dir} - [ -f ${script_dir}/../cfg/taos.cfg ] && sudo cp ${script_dir}/../cfg/taos.cfg ${cfg_install_dir} - sudo chmod 644 ${cfg_install_dir}/* + ${csudo} mkdir -p ${cfg_install_dir} + [ -f ${script_dir}/../cfg/taos.cfg ] && ${csudo} cp ${script_dir}/../cfg/taos.cfg ${cfg_install_dir} + ${csudo} chmod 644 ${cfg_install_dir}/* fi - sudo cp -f ${script_dir}/../cfg/taos.cfg ${install_main_dir}/cfg/taos.cfg.org - sudo ln -s ${cfg_install_dir}/taos.cfg ${install_main_dir}/cfg + ${csudo} cp -f ${script_dir}/../cfg/taos.cfg ${install_main_dir}/cfg/taos.cfg.org + ${csudo} ln -s ${cfg_install_dir}/taos.cfg ${install_main_dir}/cfg } function install_log() { - sudo rm -rf ${log_dir} || : - sudo mkdir -p ${log_dir} && sudo chmod 777 ${log_dir} + ${csudo} rm -rf ${log_dir} || : + ${csudo} mkdir -p ${log_dir} && ${csudo} chmod 777 ${log_dir} - sudo ln -s ${log_dir} ${install_main_dir}/log + ${csudo} ln -s ${log_dir} ${install_main_dir}/log } function install_data() { - sudo mkdir -p ${data_dir} - sudo ln -s ${data_dir} ${install_main_dir}/data + ${csudo} mkdir -p ${data_dir} + ${csudo} ln -s ${data_dir} ${install_main_dir}/data } function install_connector() { - sudo cp -rf ${source_dir}/src/connector/grafana ${install_main_dir}/connector - sudo cp -rf ${source_dir}/src/connector/python ${install_main_dir}/connector - sudo cp -rf ${source_dir}/src/connector/go ${install_main_dir}/connector + ${csudo} cp -rf ${source_dir}/src/connector/grafana ${install_main_dir}/connector + ${csudo} cp -rf ${source_dir}/src/connector/python ${install_main_dir}/connector + ${csudo} cp -rf ${source_dir}/src/connector/go ${install_main_dir}/connector - sudo cp ${binary_dir}/build/lib/*.jar ${install_main_dir}/connector &> /dev/null && sudo chmod 777 ${install_main_dir}/connector/*.jar || echo &> /dev/null + ${csudo} cp ${binary_dir}/build/lib/*.jar ${install_main_dir}/connector &> /dev/null && ${csudo} chmod 777 ${install_main_dir}/connector/*.jar || echo &> /dev/null } function install_examples() { - sudo cp -rf ${source_dir}/tests/examples/* ${install_main_dir}/examples + ${csudo} cp -rf ${source_dir}/tests/examples/* ${install_main_dir}/examples } function clean_service_on_sysvinit() { restart_config_str="taos:2345:respawn:${service_config_dir}/taosd start" if pidof taosd &> /dev/null; then - sudo service taosd stop || : + ${csudo} service taosd stop || : fi - sudo sed -i "\|${restart_config_str}|d" /etc/inittab || : - sudo rm -f ${service_config_dir}/taosd || : - sudo update-rc.d -f taosd remove || : - sudo init q || : + ${csudo} sed -i "\|${restart_config_str}|d" /etc/inittab || : + ${csudo} rm -f ${service_config_dir}/taosd || : + ${csudo} update-rc.d -f taosd remove || : + ${csudo} init q || : } function install_service_on_sysvinit() { @@ -154,12 +159,12 @@ function install_service_on_sysvinit() { sleep 1 # Install taosd service - sudo cp ${script_dir}/../rpm/init.d/taosd ${service_config_dir} && sudo chmod a+x ${service_config_dir}/taosd + ${csudo} cp ${script_dir}/../rpm/init.d/taosd ${service_config_dir} && ${csudo} chmod a+x ${service_config_dir}/taosd restart_config_str="taos:2345:respawn:${service_config_dir}/taosd start" - sudo grep -q -F "$restart_config_str" /etc/inittab || sudo bash -c "echo '${restart_config_str}' >> /etc/inittab" + ${csudo} grep -q -F "$restart_config_str" /etc/inittab || ${csudo} bash -c "echo '${restart_config_str}' >> /etc/inittab" # TODO: for centos, change here - sudo update-rc.d taosd defaults + ${csudo} update-rc.d taosd defaults # chkconfig mysqld on } @@ -168,11 +173,11 @@ function clean_service_on_systemd() { if systemctl is-active --quiet taosd; then echo "TDengine is running, stopping it..." - sudo systemctl stop taosd &> /dev/null || echo &> /dev/null + ${csudo} systemctl stop taosd &> /dev/null || echo &> /dev/null fi - sudo systemctl disable taosd &> /dev/null || echo &> /dev/null + ${csudo} systemctl disable taosd &> /dev/null || echo &> /dev/null - sudo rm -f ${taosd_service_config} + ${csudo} rm -f ${taosd_service_config} } # taos:2345:respawn:/etc/init.d/taosd start @@ -182,26 +187,26 @@ function install_service_on_systemd() { taosd_service_config="${service_config_dir}/taosd.service" - sudo bash -c "echo '[Unit]' >> ${taosd_service_config}" - sudo bash -c "echo 'Description=TDengine server service' >> ${taosd_service_config}" - sudo bash -c "echo 'After=network-online.target' >> ${taosd_service_config}" - sudo bash -c "echo 'Wants=network-online.target' >> ${taosd_service_config}" - sudo bash -c "echo >> ${taosd_service_config}" - sudo bash -c "echo '[Service]' >> ${taosd_service_config}" - sudo bash -c "echo 'Type=simple' >> ${taosd_service_config}" - sudo bash -c "echo 'ExecStart=/usr/bin/taosd' >> ${taosd_service_config}" - sudo bash -c "echo 'LimitNOFILE=infinity' >> ${taosd_service_config}" - sudo bash -c "echo 'LimitNPROC=infinity' >> ${taosd_service_config}" - sudo bash -c "echo 'LimitCORE=infinity' >> ${taosd_service_config}" - sudo bash -c "echo 'TimeoutStartSec=0' >> ${taosd_service_config}" - sudo bash -c "echo 'StandardOutput=null' >> ${taosd_service_config}" - sudo bash -c "echo 'Restart=always' >> ${taosd_service_config}" - sudo bash -c "echo 'StartLimitBurst=3' >> ${taosd_service_config}" - sudo bash -c "echo 'StartLimitInterval=60s' >> ${taosd_service_config}" - sudo bash -c "echo >> ${taosd_service_config}" - sudo bash -c "echo '[Install]' >> ${taosd_service_config}" - sudo bash -c "echo 'WantedBy=multi-user.target' >> ${taosd_service_config}" - sudo systemctl enable taosd + ${csudo} bash -c "echo '[Unit]' >> ${taosd_service_config}" + ${csudo} bash -c "echo 'Description=TDengine server service' >> ${taosd_service_config}" + ${csudo} bash -c "echo 'After=network-online.target' >> ${taosd_service_config}" + ${csudo} bash -c "echo 'Wants=network-online.target' >> ${taosd_service_config}" + ${csudo} bash -c "echo >> ${taosd_service_config}" + ${csudo} bash -c "echo '[Service]' >> ${taosd_service_config}" + ${csudo} bash -c "echo 'Type=simple' >> ${taosd_service_config}" + ${csudo} bash -c "echo 'ExecStart=/usr/bin/taosd' >> ${taosd_service_config}" + ${csudo} bash -c "echo 'LimitNOFILE=infinity' >> ${taosd_service_config}" + ${csudo} bash -c "echo 'LimitNPROC=infinity' >> ${taosd_service_config}" + ${csudo} bash -c "echo 'LimitCORE=infinity' >> ${taosd_service_config}" + ${csudo} bash -c "echo 'TimeoutStartSec=0' >> ${taosd_service_config}" + ${csudo} bash -c "echo 'StandardOutput=null' >> ${taosd_service_config}" + ${csudo} bash -c "echo 'Restart=always' >> ${taosd_service_config}" + ${csudo} bash -c "echo 'StartLimitBurst=3' >> ${taosd_service_config}" + ${csudo} bash -c "echo 'StartLimitInterval=60s' >> ${taosd_service_config}" + ${csudo} bash -c "echo >> ${taosd_service_config}" + ${csudo} bash -c "echo '[Install]' >> ${taosd_service_config}" + ${csudo} bash -c "echo 'WantedBy=multi-user.target' >> ${taosd_service_config}" + ${csudo} systemctl enable taosd } function install_service() { @@ -217,9 +222,9 @@ function update_TDengine() { # Stop the service if running if pidof taosd &> /dev/null; then if is_using_systemd; then - sudo systemctl stop taosd || : + ${csudo} systemctl stop taosd || : else - sudo service taosd stop || : + ${csudo} service taosd stop || : fi sleep 1 fi @@ -240,10 +245,10 @@ function update_TDengine() { 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}" + # echo -e "${GREEN_DARK}To start TDengine ${NC}: ${csudo} 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}" + # echo -e "${GREEN_DARK}To start TDengine ${NC}: ${csudo} update-rc.d taosd default ${RED} for the first time${NC}" + # echo -e " : ${csudo} service taosd start ${RED} after${NC}" # fi # echo -e "${GREEN_DARK}To access TDengine ${NC}: use ${GREEN_UNDERLINE}taos${NC} in shell${NC}" @@ -272,10 +277,10 @@ function install_TDengine() { 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}" + # echo -e "${GREEN_DARK}To start TDengine ${NC}: ${csudo} 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}" + # echo -e "${GREEN_DARK}To start TDengine ${NC}: ${csudo} update-rc.d taosd default ${RED} for the first time${NC}" + # echo -e " : ${csudo} service taosd start ${RED} after${NC}" #3 fi # echo -e "${GREEN_DARK}To access TDengine ${NC}: use ${GREEN_UNDERLINE}taos${NC} in shell${NC}" diff --git a/packaging/tools/makepkg.sh b/packaging/tools/makepkg.sh index 81a0b8382576fbc8a9f6ea28d7ee7ed26f64a025..3e42f7eb2571d97f187b976a65da3dfa3c9f9600 100755 --- a/packaging/tools/makepkg.sh +++ b/packaging/tools/makepkg.sh @@ -40,7 +40,7 @@ mkdir -p ${install_dir} mkdir -p ${install_dir}/inc && cp ${header_files} ${install_dir}/inc mkdir -p ${install_dir}/cfg && cp ${cfg_files} ${install_dir}/cfg mkdir -p ${install_dir}/bin && cp ${bin_files} ${install_dir}/bin && chmod a+x ${install_dir}/bin/* -mkdir -p ${install_dir}/init.d && cp ${init_files} ${install_dir}/init.d +mkdir -p ${install_dir}/init.d && cp ${init_files} ${install_dir}/init.d cd ${install_dir} tar -zcv -f taos.tar.gz * --remove-files || : diff --git a/packaging/tools/post.sh b/packaging/tools/post.sh index 94048e7b9a38d2bdea9acd5a3f3cf3a0b381806b..b6f0b9ba9d49a87d8c823bac6839ff5835c05955 100755 --- a/packaging/tools/post.sh +++ b/packaging/tools/post.sh @@ -33,6 +33,25 @@ GREEN_DARK='\033[0;32m' GREEN_UNDERLINE='\033[4;32m' NC='\033[0m' +csudo="" +if command -v sudo > /dev/null; then + csudo="sudo" +fi + +service_mod=2 +if pidof systemd &> /dev/null; then + service_mod=0 +elif $(which update-rc.d &> /dev/null); then + service_mod=1 + service_config_dir="/etc/init.d" +else + service_mod=2 +fi + +function kill_taosd() { + ${csudo} pkill -f taosd || : +} + function is_using_systemd() { if pidof systemd &> /dev/null; then return 0 @@ -41,58 +60,54 @@ function is_using_systemd() { fi } -if ! is_using_systemd; then - service_config_dir="/etc/init.d" -fi - function install_include() { - sudo rm -f ${inc_link_dir}/taos.h || : - sudo ln -s ${inc_dir}/taos.h ${inc_link_dir}/taos.h + ${csudo} rm -f ${inc_link_dir}/taos.h || : + ${csudo} ln -s ${inc_dir}/taos.h ${inc_link_dir}/taos.h } function install_lib() { - sudo rm -f ${lib_link_dir}/libtaos.so || : + ${csudo} rm -f ${lib_link_dir}/libtaos.so || : - 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 + ${csudo} ln -s ${lib_dir}/libtaos.* ${lib_link_dir}/libtaos.so.1 + ${csudo} ln -s ${lib_link_dir}/libtaos.so.1 ${lib_link_dir}/libtaos.so } function install_bin() { # Remove links - sudo rm -f ${bin_link_dir}/taos || : - sudo rm -f ${bin_link_dir}/taosd || : - sudo rm -f ${bin_link_dir}/taosdump || : - sudo rm -f ${bin_link_dir}/rmtaos || : + ${csudo} rm -f ${bin_link_dir}/taos || : + ${csudo} rm -f ${bin_link_dir}/taosd || : + ${csudo} rm -f ${bin_link_dir}/taosdump || : + ${csudo} rm -f ${bin_link_dir}/rmtaos || : - sudo chmod 0555 ${bin_dir}/* + ${csudo} chmod 0555 ${bin_dir}/* #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}/remove.sh ] && sudo ln -s ${bin_dir}/remove.sh ${bin_link_dir}/rmtaos || : + [ -x ${bin_dir}/taos ] && ${csudo} ln -s ${bin_dir}/taos ${bin_link_dir}/taos || : + [ -x ${bin_dir}/taosd ] && ${csudo} ln -s ${bin_dir}/taosd ${bin_link_dir}/taosd || : + [ -x ${bin_dir}/taosdump ] && ${csudo} ln -s ${bin_dir}/taosdump ${bin_link_dir}/taosdump || : +# [ -x ${bin_dir}/remove.sh ] && ${csudo} ln -s ${bin_dir}/remove.sh ${bin_link_dir}/rmtaos || : } function install_config() { if [ ! -f ${cfg_install_dir}/taos.cfg ]; then - sudo sudo mkdir -p ${cfg_install_dir} - [ -f ${cfg_dir}/taos.cfg ] && sudo cp ${cfg_dir}/taos.cfg ${cfg_install_dir} - sudo chmod 644 ${cfg_install_dir}/* + ${csudo} ${csudo} mkdir -p ${cfg_install_dir} + [ -f ${cfg_dir}/taos.cfg ] && ${csudo} cp ${cfg_dir}/taos.cfg ${cfg_install_dir} + ${csudo} chmod 644 ${cfg_install_dir}/* fi - sudo mv ${cfg_dir}/taos.cfg ${cfg_dir}/taos.cfg.org - sudo ln -s ${cfg_install_dir}/taos.cfg ${cfg_dir} + ${csudo} mv ${cfg_dir}/taos.cfg ${cfg_dir}/taos.cfg.org + ${csudo} ln -s ${cfg_install_dir}/taos.cfg ${cfg_dir} } function clean_service_on_sysvinit() { restart_config_str="taos:2345:respawn:${service_config_dir}/taosd start" #if pidof taosd &> /dev/null; then - # sudo service taosd stop || : + # ${csudo} service taosd stop || : #fi - sudo sed -i "\|${restart_config_str}|d" /etc/inittab || : - sudo rm -f ${service_config_dir}/taosd || : - sudo update-rc.d -f taosd remove || : - sudo init q || : + ${csudo} sed -i "\|${restart_config_str}|d" /etc/inittab || : + ${csudo} rm -f ${service_config_dir}/taosd || : + ${csudo} update-rc.d -f taosd remove || : + ${csudo} init q || : } function install_service_on_sysvinit() { @@ -101,13 +116,13 @@ function install_service_on_sysvinit() { sleep 1 # Install taosd service - sudo cp %{init_d_dir}/taosd ${service_config_dir} && sudo chmod a+x ${service_config_dir}/taosd + ${csudo} cp %{init_d_dir}/taosd ${service_config_dir} && ${csudo} chmod a+x ${service_config_dir}/taosd restart_config_str="taos:2345:respawn:${service_config_dir}/taosd start" - sudo grep -q -F "$restart_config_str" /etc/inittab || sudo bash -c "echo '${restart_config_str}' >> /etc/inittab" + ${csudo} grep -q -F "$restart_config_str" /etc/inittab || ${csudo} bash -c "echo '${restart_config_str}' >> /etc/inittab" # TODO: for centos, change here - sudo update-rc.d taosd defaults + ${csudo} update-rc.d taosd defaults # chkconfig mysqld on } @@ -117,11 +132,11 @@ function clean_service_on_systemd() { # taosd service already is stoped before install #if systemctl is-active --quiet taosd; then # echo "TDengine is running, stopping it..." - # sudo systemctl stop taosd &> /dev/null || echo &> /dev/null + # ${csudo} systemctl stop taosd &> /dev/null || echo &> /dev/null #fi - sudo systemctl disable taosd &> /dev/null || echo &> /dev/null + ${csudo} systemctl disable taosd &> /dev/null || echo &> /dev/null - sudo rm -f ${taosd_service_config} + ${csudo} rm -f ${taosd_service_config} } # taos:2345:respawn:/etc/init.d/taosd start @@ -131,33 +146,36 @@ function install_service_on_systemd() { taosd_service_config="${service_config_dir}/taosd.service" - sudo bash -c "echo '[Unit]' >> ${taosd_service_config}" - sudo bash -c "echo 'Description=TDengine server service' >> ${taosd_service_config}" - sudo bash -c "echo 'After=network-online.target' >> ${taosd_service_config}" - sudo bash -c "echo 'Wants=network-online.target' >> ${taosd_service_config}" - sudo bash -c "echo >> ${taosd_service_config}" - sudo bash -c "echo '[Service]' >> ${taosd_service_config}" - sudo bash -c "echo 'Type=simple' >> ${taosd_service_config}" - sudo bash -c "echo 'ExecStart=/usr/bin/taosd' >> ${taosd_service_config}" - sudo bash -c "echo 'LimitNOFILE=infinity' >> ${taosd_service_config}" - sudo bash -c "echo 'LimitNPROC=infinity' >> ${taosd_service_config}" - sudo bash -c "echo 'LimitCORE=infinity' >> ${taosd_service_config}" - sudo bash -c "echo 'TimeoutStartSec=0' >> ${taosd_service_config}" - sudo bash -c "echo 'StandardOutput=null' >> ${taosd_service_config}" - sudo bash -c "echo 'Restart=always' >> ${taosd_service_config}" - sudo bash -c "echo 'StartLimitBurst=3' >> ${taosd_service_config}" - sudo bash -c "echo 'StartLimitInterval=60s' >> ${taosd_service_config}" - sudo bash -c "echo >> ${taosd_service_config}" - sudo bash -c "echo '[Install]' >> ${taosd_service_config}" - sudo bash -c "echo 'WantedBy=multi-user.target' >> ${taosd_service_config}" - sudo systemctl enable taosd + ${csudo} bash -c "echo '[Unit]' >> ${taosd_service_config}" + ${csudo} bash -c "echo 'Description=TDengine server service' >> ${taosd_service_config}" + ${csudo} bash -c "echo 'After=network-online.target' >> ${taosd_service_config}" + ${csudo} bash -c "echo 'Wants=network-online.target' >> ${taosd_service_config}" + ${csudo} bash -c "echo >> ${taosd_service_config}" + ${csudo} bash -c "echo '[Service]' >> ${taosd_service_config}" + ${csudo} bash -c "echo 'Type=simple' >> ${taosd_service_config}" + ${csudo} bash -c "echo 'ExecStart=/usr/bin/taosd' >> ${taosd_service_config}" + ${csudo} bash -c "echo 'LimitNOFILE=infinity' >> ${taosd_service_config}" + ${csudo} bash -c "echo 'LimitNPROC=infinity' >> ${taosd_service_config}" + ${csudo} bash -c "echo 'LimitCORE=infinity' >> ${taosd_service_config}" + ${csudo} bash -c "echo 'TimeoutStartSec=0' >> ${taosd_service_config}" + ${csudo} bash -c "echo 'StandardOutput=null' >> ${taosd_service_config}" + ${csudo} bash -c "echo 'Restart=always' >> ${taosd_service_config}" + ${csudo} bash -c "echo 'StartLimitBurst=3' >> ${taosd_service_config}" + ${csudo} bash -c "echo 'StartLimitInterval=60s' >> ${taosd_service_config}" + ${csudo} bash -c "echo >> ${taosd_service_config}" + ${csudo} bash -c "echo '[Install]' >> ${taosd_service_config}" + ${csudo} bash -c "echo 'WantedBy=multi-user.target' >> ${taosd_service_config}" + ${csudo} systemctl enable taosd } function install_service() { - if is_using_systemd; then + if ((${service_mod}==0)); then install_service_on_systemd - else + elif ((${service_mod}==1)); then install_service_on_sysvinit + else + # manual start taosd + kill_taosd fi } @@ -165,14 +183,14 @@ function install_TDengine() { echo -e "${GREEN}Start to install TDEngine...${NC}" #install log and data dir , then ln to /usr/local/taos - sudo mkdir -p ${log_dir} && sudo chmod 777 ${log_dir} - sudo mkdir -p ${data_dir} + ${csudo} mkdir -p ${log_dir} && ${csudo} chmod 777 ${log_dir} + ${csudo} mkdir -p ${data_dir} - sudo rm -rf ${log_link_dir} || : - sudo rm -rf ${data_link_dir} || : + ${csudo} rm -rf ${log_link_dir} || : + ${csudo} rm -rf ${data_link_dir} || : - sudo ln -s ${log_dir} ${log_link_dir} || : - sudo ln -s ${data_dir} ${data_link_dir} || : + ${csudo} ln -s ${log_dir} ${log_link_dir} || : + ${csudo} ln -s ${data_dir} ${data_link_dir} || : # Install include, lib, binary and service install_include @@ -186,11 +204,13 @@ 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}" + if ((${service_mod}==0)); then + echo -e "${GREEN_DARK}To start TDengine ${NC}: ${csudo} systemctl start taosd${NC}" + elif ((${service_mod}==1)); then + echo -e "${GREEN_DARK}To start TDengine ${NC}: ${csudo} update-rc.d taosd default ${RED} for the first time${NC}" + echo -e " : ${csudo} service taosd start ${RED} after${NC}" + else + echo -e "${GREEN_DARK}To start TDengine ${NC}: ./taosd${NC}" fi echo -e "${GREEN_DARK}To access TDengine ${NC}: use ${GREEN_UNDERLINE}taos${NC} in shell${NC}" diff --git a/packaging/tools/preun.sh b/packaging/tools/preun.sh index 5fb46acda50d5ba956ae93311777cc6f12b60ef9..1fcdb3309e0d981a98479d5ae9f8f867f1214444 100755 --- a/packaging/tools/preun.sh +++ b/packaging/tools/preun.sh @@ -17,6 +17,11 @@ cfg_link_dir="/usr/local/taos/cfg" service_config_dir="/etc/systemd/system" taos_service_name="taosd" +csudo="" +if command -v sudo > /dev/null; then + csudo="sudo" +fi + function is_using_systemd() { if pidof systemd &> /dev/null; then return 0 @@ -34,11 +39,11 @@ function clean_service_on_systemd() { if systemctl is-active --quiet ${taos_service_name}; then echo "TDengine taosd is running, stopping it..." - sudo systemctl stop ${taos_service_name} &> /dev/null || echo &> /dev/null + ${csudo} systemctl stop ${taos_service_name} &> /dev/null || echo &> /dev/null fi - sudo systemctl disable ${taos_service_name} &> /dev/null || echo &> /dev/null + ${csudo} systemctl disable ${taos_service_name} &> /dev/null || echo &> /dev/null - sudo rm -f ${taosd_service_config} + ${csudo} rm -f ${taosd_service_config} } function clean_service_on_sysvinit() { @@ -46,13 +51,13 @@ function clean_service_on_sysvinit() { if pidof taosd &> /dev/null; then echo "TDengine taosd is running, stopping it..." - sudo service taosd stop || : + ${csudo} service taosd stop || : fi - sudo sed -i "\|${restart_config_str}|d" /etc/inittab || : - sudo rm -f ${service_config_dir}/taosd || : - sudo update-rc.d -f taosd remove || : - sudo init q || : + ${csudo} sed -i "\|${restart_config_str}|d" /etc/inittab || : + ${csudo} rm -f ${service_config_dir}/taosd || : + ${csudo} update-rc.d -f taosd remove || : + ${csudo} init q || : } function clean_service() { @@ -67,14 +72,14 @@ function clean_service() { clean_service # Remove all links -sudo rm -f ${bin_link_dir}/taos || : -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.* || : - -sudo rm -f ${log_link_dir} || : -sudo rm -f ${data_link_dir} || : +${csudo} rm -f ${bin_link_dir}/taos || : +${csudo} rm -f ${bin_link_dir}/taosd || : +${csudo} rm -f ${bin_link_dir}/taosdump || : +${csudo} rm -f ${cfg_link_dir}/* || : +${csudo} rm -f ${inc_link_dir}/taos.h || : +${csudo} rm -f ${lib_link_dir}/libtaos.* || : + +${csudo} rm -f ${log_link_dir} || : +${csudo} rm -f ${data_link_dir} || : echo -e "${GREEN}TDEngine is removed successfully!${NC}" diff --git a/packaging/tools/remove.sh b/packaging/tools/remove.sh index 921103c197eb15c6bff47bb5aafbd23995e2401e..4d0e8e8e84164447eee4081258b449311fc99b4f 100755 --- a/packaging/tools/remove.sh +++ b/packaging/tools/remove.sh @@ -29,6 +29,11 @@ service_config_dir="/etc/systemd/system" taos_service_name="taosd" nginx_service_name="tdnginx" +csudo="" +if command -v sudo > /dev/null; then + csudo="sudo" +fi + function is_using_systemd() { if pidof systemd &> /dev/null; then return 0 @@ -43,45 +48,45 @@ fi function clean_bin() { # Remove link - sudo rm -f ${bin_link_dir}/taos || : - sudo rm -f ${bin_link_dir}/taosd || : - sudo rm -f ${bin_link_dir}/taosdump || : - sudo rm -f ${bin_link_dir}/rmtaos || : + ${csudo} rm -f ${bin_link_dir}/taos || : + ${csudo} rm -f ${bin_link_dir}/taosd || : + ${csudo} rm -f ${bin_link_dir}/taosdump || : + ${csudo} rm -f ${bin_link_dir}/rmtaos || : # Remove binary files - #sudo rm -rf ${bin_dir} || : + #${csudo} rm -rf ${bin_dir} || : } function clean_lib() { # Remove link - sudo rm -f ${lib_link_dir}/libtaos.* || : + ${csudo} rm -f ${lib_link_dir}/libtaos.* || : - #sudo rm -f /usr/lib/libtaos.so || : - #sudo rm -rf ${lib_dir} || : + #${csudo} rm -f /usr/lib/libtaos.so || : + #${csudo} rm -rf ${lib_dir} || : } function clean_header() { # Remove link - sudo rm -f ${inc_link_dir}/taos.h || : + ${csudo} rm -f ${inc_link_dir}/taos.h || : - #sudo rm -rf ${header_dir} + #${csudo} rm -rf ${header_dir} } function clean_config() { # Remove link - sudo rm -f ${cfg_link_dir}/* || : - #sudo rm -rf ${cfg_link_dir} || : + ${csudo} rm -f ${cfg_link_dir}/* || : + #${csudo} rm -rf ${cfg_link_dir} || : } function clean_log() { if grep -e '^\s*logDir.*$' ${cfg_dir}/taos.cfg &> /dev/null; then config_log_dir=$(cut -d ' ' -f2 <<< $(grep -e '^\s*logDir.*$' ${cfg_dir}/taos.cfg)) # echo "Removing log dir ${config_log_dir}......" - sudo rm -rf ${config_log_dir} || : + ${csudo} rm -rf ${config_log_dir} || : fi # Remove link - sudo rm -rf ${log_link_dir} || : - sudo rm -rf ${log_dir} || : + ${csudo} rm -rf ${log_link_dir} || : + ${csudo} rm -rf ${log_dir} || : } function clean_service_on_systemd() { @@ -89,11 +94,11 @@ function clean_service_on_systemd() { if systemctl is-active --quiet ${taos_service_name}; then echo "TDengine taosd is running, stopping it..." - sudo systemctl stop ${taos_service_name} &> /dev/null || echo &> /dev/null + ${csudo} systemctl stop ${taos_service_name} &> /dev/null || echo &> /dev/null fi - sudo systemctl disable ${taos_service_name} &> /dev/null || echo &> /dev/null + ${csudo} systemctl disable ${taos_service_name} &> /dev/null || echo &> /dev/null - sudo rm -f ${taosd_service_config} + ${csudo} rm -f ${taosd_service_config} } function clean_service_on_sysvinit() { @@ -101,13 +106,13 @@ function clean_service_on_sysvinit() { if pidof taosd &> /dev/null; then echo "TDengine taosd is running, stopping it..." - sudo service taosd stop || : + ${csudo} service taosd stop || : fi - sudo sed -i "\|${restart_config_str}|d" /etc/inittab || : - sudo rm -f ${service_config_dir}/taosd || : - sudo update-rc.d -f taosd remove || : - sudo init q || : + ${csudo} sed -i "\|${restart_config_str}|d" /etc/inittab || : + ${csudo} rm -f ${service_config_dir}/taosd || : + ${csudo} update-rc.d -f taosd remove || : + ${csudo} init q || : } function clean_service() { @@ -141,16 +146,16 @@ clean_log # Remove configuration file clean_config # Remove data directory -sudo rm -rf ${data_link_dir} || : +${csudo} rm -rf ${data_link_dir} || : [ "$isAll" = "false" ] && exit 0 || : echo -e -n "${RED}Do you want to delete data stored in TDengine? [y/N]: ${NC}" read is_delete while true; do if [ "${is_delete}" = "y" ] || [ "${is_delete}" = "Y" ]; then - sudo rm -rf ${data_dir} + ${csudo} rm -rf ${data_dir} # echo "Removing data file ${config_data_dir}..." - [ -n ${config_data_dir} ] && sudo rm -rf ${config_data_dir} + [ -n ${config_data_dir} ] && ${csudo} rm -rf ${config_data_dir} break elif [ "${is_delete}" = "n" ] || [ "${is_delete}" = "N" ]; then break @@ -159,15 +164,15 @@ while true; do fi done -sudo rm -rf ${install_main_dir} +${csudo} rm -rf ${install_main_dir} osinfo=$(awk -F= '/^NAME/{print $2}' /etc/os-release) if echo $osinfo | grep -qwi "ubuntu" ; then # echo "this is ubuntu system" - sudo rm -f /var/lib/dpkg/info/tdengine* || : + ${csudo} rm -f /var/lib/dpkg/info/tdengine* || : elif echo $osinfo | grep -qwi "centos" ; then echo "this is centos system" - sudo rpm -e --noscripts tdengine || : + ${csudo} rpm -e --noscripts tdengine || : fi echo -e "${GREEN}TDEngine is removed successfully!${NC}" diff --git a/src/connector/go/src/taosSql/result.go b/src/connector/go/src/taosSql/result.go index a57ca7bae35a0fcb619f30a40a43a3a150299577..e6b0adcac7686c9bb0091a172bacda6c7cc02eb3 100755 --- a/src/connector/go/src/taosSql/result.go +++ b/src/connector/go/src/taosSql/result.go @@ -15,8 +15,8 @@ package taosSql /* -#cgo CFLAGS : -I/usr/local/include/taos/ -#cgo LDFLAGS: -L/usr/local/lib/taos -ltaos +#cgo CFLAGS : -I/usr/include +#cgo LDFLAGS: -L/usr/lib -ltaos #include #include #include diff --git a/src/connector/go/src/taosSql/rows.go b/src/connector/go/src/taosSql/rows.go index f9177420c8d6abb616605e8e5c82ffb3af42b1dc..6407fc334e929f3ba636519deb959fd9f0c40d10 100755 --- a/src/connector/go/src/taosSql/rows.go +++ b/src/connector/go/src/taosSql/rows.go @@ -14,8 +14,8 @@ */ package taosSql /* -#cgo CFLAGS : -I/usr/local/include/taos/ -#cgo LDFLAGS: -L/usr/local/lib/taos -ltaos +#cgo CFLAGS : -I/usr/include +#cgo LDFLAGS: -L/usr/lib -ltaos #include #include #include diff --git a/src/connector/go/src/taosSql/taosSqlCgo.go b/src/connector/go/src/taosSql/taosSqlCgo.go index 8e6d9e7cc42a3951b9ba060deaeeacff415238c9..78835d5639e4c1199947e7ef8a1efb28494df0a7 100755 --- a/src/connector/go/src/taosSql/taosSqlCgo.go +++ b/src/connector/go/src/taosSql/taosSqlCgo.go @@ -15,8 +15,8 @@ package taosSql /* -#cgo CFLAGS : -I/usr/local/include/taos/ -#cgo LDFLAGS: -L/usr/local/lib/taos -ltaos +#cgo CFLAGS : -I/usr/include +#cgo LDFLAGS: -L/usr/lib -ltaos #include #include #include