From 1f4807a435d3c25e0a791a6631f794ea2e600343 Mon Sep 17 00:00:00 2001 From: plum-lihui <2849823933@qq.com> Date: Fri, 19 Jul 2019 15:40:12 +0800 Subject: [PATCH] [Modify the use of sudo commands] --- packaging/tools/make_install.sh | 173 ++++++++++++++++---------------- 1 file changed, 89 insertions(+), 84 deletions(-) diff --git a/packaging/tools/make_install.sh b/packaging/tools/make_install.sh index 1eb62da79f..d8f0d7eab3 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}" -- GitLab