[Modify the use of sudo commands]

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}"