change

packaging/deb/powerd

-#!/bin/bash 
-#
-# Modified from original source: Elastic Search
-# https://github.com/elasticsearch/elasticsearch
-# Thank you to the Elastic Search authors
-#
-# chkconfig: 2345 99 01
-#
-### BEGIN INIT INFO
-# Provides:          PowerDB
-# Required-Start:    $local_fs $network $syslog
-# Required-Stop:     $local_fs $network $syslog
-# Default-Start:     2 3 4 5
-# Default-Stop:      0 1 6
-# Short-Description: Starts PowerDB powerd
-# Description:       Starts PowerDB powerd, a time-series database engine
-### END INIT INFO
-
-set -e
-
-PATH="/bin:/usr/bin:/sbin:/usr/sbin"
-NAME="PowerDB"
-USER="root"
-GROUP="root"
-DAEMON="/usr/local/power/bin/powerd"
-DAEMON_OPTS=""
-PID_FILE="/var/run/$NAME.pid"
-APPARGS=""
-
-# Maximum number of open files
-MAX_OPEN_FILES=65535
-
-. /lib/lsb/init-functions
-
-case "$1" in
-    start)
-
-        log_action_begin_msg "Starting PowerDB..."
-        if start-stop-daemon --test --start --chuid "$USER:$GROUP" --background --make-pidfile --pidfile "$PID_FILE" --exec "$DAEMON" -- $APPARGS &> /dev/null; then
-
-            touch "$PID_FILE" && chown "$USER":"$GROUP" "$PID_FILE"
-
-            if [ -n "$MAX_OPEN_FILES" ]; then
-                ulimit -n $MAX_OPEN_FILES
-            fi
-
-            start-stop-daemon --start --chuid "$USER:$GROUP" --background --make-pidfile --pidfile "$PID_FILE" --exec "$DAEMON" -- $APPARGS
-
-            log_end_msg $?
-        fi
-        ;;
-
-    stop)
-        log_action_begin_msg "Stopping PowerDB..."
-        set +e
-        if [ -f "$PID_FILE" ]; then
-            start-stop-daemon --stop --pidfile "$PID_FILE" --user "$USER" --retry=TERM/120/KILL/5 > /dev/null
-            if [ $? -eq 1 ]; then
-                log_action_cont_msg "TSD is not running but pid file exists, cleaning up"
-            elif [ $? -eq 3 ]; then
-                PID="`cat $PID_FILE`"
-                log_failure_msg "Failed to stop PowerDB (pid $PID)"
-                exit 1
-            fi
-            rm -f "$PID_FILE"
-        else
-            log_action_cont_msg "PowerDB was not running"
-        fi
-        log_action_end_msg 0
-        set -e
-        ;;
-
-    restart|force-reload)
-        if [ -f "$PID_FILE" ]; then
-            $0 stop
-            sleep 1
-        fi
-        $0 start
-        ;;
-    status)
-        status_of_proc -p "$PID_FILE" "$DAEMON" "$NAME"
-        ;;
-    *)
-        exit 1
-        ;;
-esac
-
-exit 0

packaging/deb/taosd

 #!/bin/bash
-#
-# Modified from original source: Elastic Search
-# https://github.com/elasticsearch/elasticsearch
-# Thank you to the Elastic Search authors
-#
-# chkconfig: 2345 99 01
-#
-### BEGIN INIT INFO
-# Provides:          TDengine
-# Required-Start:    $local_fs $network $syslog
-# Required-Stop:     $local_fs $network $syslog
-# Default-Start:     2 3 4 5
-# Default-Stop:      0 1 6
-# Short-Description: Starts TDengine taosd
-# Description:       Starts TDengine taosd, a time-series database engine
-### END INIT INFO
 
 set -e
 

packaging/sed_pro.sh

@@ -51,6 +51,47 @@ function replace_community_pro() {
   sed -i "s/taos connections/prodbc connections/g" ${top_dir}/src/rpc/src/rpcMain.c
   # src/plugins/monitor/src/monMain.c
   sed -i "s/taosd is quiting/prodbs is quiting/g" ${top_dir}/src/plugins/monitor/src/monMain.c
+  # packaging/rpm/taosd
+  sed -i "s/TDengine/ProDB/g" ${top_dir}/packaging/rpm/taosd
+  sed -i "s/usr\/local\/taos/usr\/local\/ProDB/g" ${top_dir}/packaging/rpm/taosd
+  sed -i "s/taosd/prodbs/g" ${top_dir}/packaging/rpm/taosd
+  # packaging/deb/taosd
+  sed -i "s/TDengine/ProDB/g" ${top_dir}/packaging/deb/taosd
+  sed -i "s/usr\/local\/taos/usr\/local\/ProDB/g" ${top_dir}/packaging/deb/taosd
+  sed -i "s/taosd/prodbs/g" ${top_dir}/packaging/deb/taosd
+  # packaging/tools/install.sh
+  sed -i "s/\/var\/lib\/taos/\/var\/lib\/ProDB/g" ${top_dir}/packaging/tools/install.sh
+  sed -i "s/\/var\/log\/taos/\/var\/log\/ProDB/g" ${top_dir}/packaging/tools/install.sh
+  sed -i "s/\/usr\/local\/taos/\/usr\/local/ProDB/g" ${top_dir}/packaging/tools/install.sh
+  sed -i "s/\/etc\/taos/\/etc\/ProDB/g" ${top_dir}/packaging/tools/install.sh
+  sed -i "s/taosdata\.com/hanatech\.com\.cn/g" ${top_dir}/packaging/tools/install.sh
+  sed -i "s/\${bin_link_dir}\/taos /\${bin_link_dir}/prodbc /g" ${top_dir}/packaging/tools/install.sh
+  sed -i "s/\${bin_link_dir}\/taosd /\${bin_link_dir}/prodbs /g" ${top_dir}/packaging/tools/install.sh
+  sed -i "s/bin\/taos /bin\/prodbc /g" ${top_dir}/packaging/tools/install.sh
+  sed -i "s/bin\/taosd /bin\/prodbs /g" ${top_dir}/packaging/tools/install.sh
+  sed -i "s/taos\.cfg/prodb\.cfg/g" ${top_dir}/packaging/tools/install.sh
+  sed -i "s/TDengine/ProDB/g" ${top_dir}/packaging/tools/install.sh
+  sed -i "s/ taosd / prodbs /g" ${top_dir}/packaging/tools/install.sh
+  sed -i "s/\${service_config_dir}\/taosd/\${service_config_dir}\/prodbs/g" ${top_dir}/packaging/tools/install.sh
+  sed -i "s/init\.d\/taosd/init\.d\/prodbs/g" ${top_dir}/packaging/tools/install.sh
+  sed -i "s/--quiet taosd/--quiet prodbs/g" ${top_dir}/packaging/tools/install.sh
+  sed -i "s/cfg\/taosd\.service/cfg\/prodbs\.service/g" ${top_dir}/packaging/tools/install.sh
+  sed -i "s/taos\.tar\.gz/prodb\.tar\.gz/g" ${top_dir}/packaging/tools/install.sh
+  sed -i "s/systemctl start taosd/systemctl start prodbs/g" ${top_dir}/packaging/tools/install.sh
+  sed -i "s/\.\/taosd/\.\/prodbs/g" ${top_dir}/packaging/tools/install.sh
+  sed -i "s/taos -h/prodbc -h/g" ${top_dir}/packaging/tools/install.sh
+  sed -i "s/taosd --force-keep-file/prodbs --force-keep-file/g" ${top_dir}/packaging/tools/install.sh
+  sed -i "s/taos_history/prodb_history/g" ${top_dir}/packaging/tools/install.sh
+  sed -i "s/\${bin_dir}\/taosd /\${bin_dir}/prodbs /g" ${top_dir}/packaging/tools/install.sh
+  sed -i "s/\${bin_dir}\/taos /\${bin_dir}/prodbc /g" ${top_dir}/packaging/tools/install.sh
+  # packaging/tools/remove.sh
+  sed -i "s/usr\/local\/taos/usr\/local\/ProDB/g" ${top_dir}/packaging/tools/remove.sh
+  sed -i "s/\"taosd\"/\"prodbs\"/g" ${top_dir}/packaging/tools/remove.sh
+  sed -i "s/\${bin_link_dir}\/taos /\${bin_link_dir}\/prodbc /g" ${top_dir}/packaging/tools/remove.sh
+  sed -i "s/\${bin_link_dir}\/taosd /\${bin_link_dir}\/prodbs /g" ${top_dir}/packaging/tools/remove.sh
+  sed -i "s/TDengine/ProDB/g" ${top_dir}/packaging/tools/remove.sh
+  sed -i "s/ taosd / prodbs /g" ${top_dir}/packaging/tools/remove.sh
+
 }
 
 function replace_enterprise_pro() {

packaging/tools/makepkg.sh

@@ -146,8 +146,8 @@ if [ -f "${cfg_dir}/nginxd.service" ]; then
 fi
 
 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_file_deb} ${install_dir}/init.d/taos.deb
-mkdir -p ${install_dir}/init.d && cp ${init_file_rpm} ${install_dir}/init.d/taos.rpm
+mkdir -p ${install_dir}/init.d && cp ${init_file_deb} ${install_dir}/init.d/${clientName}.deb
+mkdir -p ${install_dir}/init.d && cp ${init_file_rpm} ${install_dir}/init.d/${clientName}.rpm
 mkdir -p ${install_dir}/init.d && cp ${init_file_tarbitrator_deb} ${install_dir}/init.d/tarbitratord.deb || :
 mkdir -p ${install_dir}/init.d && cp ${init_file_tarbitrator_rpm} ${install_dir}/init.d/tarbitratord.rpm || :
 

packaging/tools/remove.sh

@@ -31,181 +31,181 @@ taosadapter_service_name="taosadapter"
 tarbitrator_service_name="tarbitratord"
 nginx_service_name="nginxd"
 csudo=""
-if command -v sudo > /dev/null; then
-    csudo="sudo "
+if command -v sudo >/dev/null; then
+  csudo="sudo "
 fi
 
 initd_mod=0
 service_mod=2
-if pidof systemd &> /dev/null; then
-    service_mod=0
-elif $(which service &> /dev/null); then
-    service_mod=1
-    service_config_dir="/etc/init.d"
-    if $(which chkconfig &> /dev/null); then
-         initd_mod=1
-    elif $(which insserv &> /dev/null); then
-        initd_mod=2
-    elif $(which update-rc.d &> /dev/null); then
-        initd_mod=3
-    else
-        service_mod=2
-    fi
-else
+if pidof systemd &>/dev/null; then
+  service_mod=0
+elif $(which service &>/dev/null); then
+  service_mod=1
+  service_config_dir="/etc/init.d"
+  if $(which chkconfig &>/dev/null); then
+    initd_mod=1
+  elif $(which insserv &>/dev/null); then
+    initd_mod=2
+  elif $(which update-rc.d &>/dev/null); then
+    initd_mod=3
+  else
     service_mod=2
+  fi
+else
+  service_mod=2
 fi
 
 function kill_taosadapter() {
   pid=$(ps -ef | grep "taosadapter" | grep -v "grep" | awk '{print $2}')
   if [ -n "$pid" ]; then
-    ${csudo}kill -9 $pid   || :
+    ${csudo}kill -9 $pid || :
   fi
 }
 
 function kill_taosd() {
   pid=$(ps -ef | grep "taosd" | grep -v "grep" | awk '{print $2}')
   if [ -n "$pid" ]; then
-    ${csudo}kill -9 $pid   || :
+    ${csudo}kill -9 $pid || :
   fi
 }
 
 function kill_tarbitrator() {
   pid=$(ps -ef | grep "tarbitrator" | grep -v "grep" | awk '{print $2}')
   if [ -n "$pid" ]; then
-    ${csudo}kill -9 $pid   || :
+    ${csudo}kill -9 $pid || :
   fi
 }
 function clean_bin() {
-    # Remove link
-    ${csudo}rm -f ${bin_link_dir}/taos        || :
-    ${csudo}rm -f ${bin_link_dir}/taosd       || :
-    ${csudo}rm -f ${bin_link_dir}/taosadapter || :
-    ${csudo}rm -f ${bin_link_dir}/taosdemo    || :
-    ${csudo}rm -f ${bin_link_dir}/taosdump    || :
-    ${csudo}rm -f ${bin_link_dir}/rmtaos      || :
-    ${csudo}rm -f ${bin_link_dir}/tarbitrator || :
-    ${csudo}rm -f ${bin_link_dir}/set_core    || :
-    ${csudo}rm -f ${bin_link_dir}/run_taosd.sh || :
+  # Remove link
+  ${csudo}rm -f ${bin_link_dir}/taos || :
+  ${csudo}rm -f ${bin_link_dir}/taosd || :
+  ${csudo}rm -f ${bin_link_dir}/taosadapter || :
+  ${csudo}rm -f ${bin_link_dir}/taosdemo || :
+  ${csudo}rm -f ${bin_link_dir}/taosdump || :
+  ${csudo}rm -f ${bin_link_dir}/rmtaos || :
+  ${csudo}rm -f ${bin_link_dir}/tarbitrator || :
+  ${csudo}rm -f ${bin_link_dir}/set_core || :
+  ${csudo}rm -f ${bin_link_dir}/run_taosd.sh || :
 }
 
 function clean_lib() {
-    # Remove link
-    ${csudo}rm -f ${lib_link_dir}/libtaos.*      || :
-    ${csudo}rm -f ${lib64_link_dir}/libtaos.*    || :
-    #${csudo}rm -rf ${v15_java_app_dir}           || :
+  # Remove link
+  ${csudo}rm -f ${lib_link_dir}/libtaos.* || :
+  ${csudo}rm -f ${lib64_link_dir}/libtaos.* || :
+  #${csudo}rm -rf ${v15_java_app_dir}           || :
 }
 
 function clean_header() {
-    # Remove link
-    ${csudo}rm -f ${inc_link_dir}/taos.h       || :
-    ${csudo}rm -f ${inc_link_dir}/taosdef.h    || :
-    ${csudo}rm -f ${inc_link_dir}/taoserror.h  || :
+  # Remove link
+  ${csudo}rm -f ${inc_link_dir}/taos.h || :
+  ${csudo}rm -f ${inc_link_dir}/taosdef.h || :
+  ${csudo}rm -f ${inc_link_dir}/taoserror.h || :
 }
 
 function clean_config() {
-    # Remove link
-    ${csudo}rm -f ${cfg_link_dir}/*            || :
+  # Remove link
+  ${csudo}rm -f ${cfg_link_dir}/* || :
 }
 
 function clean_log() {
-    # Remove link
-    ${csudo}rm -rf ${log_link_dir}    || :
+  # Remove link
+  ${csudo}rm -rf ${log_link_dir} || :
 }
 
 function clean_service_on_systemd() {
-    taosd_service_config="${service_config_dir}/${taos_service_name}.service"
-    if systemctl is-active --quiet ${taos_service_name}; then
-        echo "TDengine taosd is running, stopping it..."
-        ${csudo}systemctl stop ${taos_service_name} &> /dev/null || echo &> /dev/null
-    fi
-    ${csudo}systemctl disable ${taos_service_name} &> /dev/null || echo &> /dev/null
-    ${csudo}rm -f ${taosd_service_config}
+  taosd_service_config="${service_config_dir}/${taos_service_name}.service"
+  if systemctl is-active --quiet ${taos_service_name}; then
+    echo "TDengine taosd is running, stopping it..."
+    ${csudo}systemctl stop ${taos_service_name} &>/dev/null || echo &>/dev/null
+  fi
+  ${csudo}systemctl disable ${taos_service_name} &>/dev/null || echo &>/dev/null
+  ${csudo}rm -f ${taosd_service_config}
 
-    taosadapter_service_config="${service_config_dir}/taosadapter.service"
-    if systemctl is-active --quiet ${taosadapter_service_name}; then
-        echo "TDengine taosAdapter is running, stopping it..."
-        ${csudo}systemctl stop ${taosadapter_service_name} &> /dev/null || echo &> /dev/null
-    fi
-    ${csudo}systemctl disable ${taosadapter_service_name} &> /dev/null || echo &> /dev/null
-    [ -f ${taosadapter_service_config} ] && ${csudo}rm -f ${taosadapter_service_config}
+  taosadapter_service_config="${service_config_dir}/taosadapter.service"
+  if systemctl is-active --quiet ${taosadapter_service_name}; then
+    echo "TDengine taosAdapter is running, stopping it..."
+    ${csudo}systemctl stop ${taosadapter_service_name} &>/dev/null || echo &>/dev/null
+  fi
+  ${csudo}systemctl disable ${taosadapter_service_name} &>/dev/null || echo &>/dev/null
+  [ -f ${taosadapter_service_config} ] && ${csudo}rm -f ${taosadapter_service_config}
 
-    tarbitratord_service_config="${service_config_dir}/${tarbitrator_service_name}.service"
-    if systemctl is-active --quiet ${tarbitrator_service_name}; then
-        echo "TDengine tarbitrator is running, stopping it..."
-        ${csudo}systemctl stop ${tarbitrator_service_name} &> /dev/null || echo &> /dev/null
-    fi
-    ${csudo}systemctl disable ${tarbitrator_service_name} &> /dev/null || echo &> /dev/null
-    ${csudo}rm -f ${tarbitratord_service_config}
-
-    if [ "$verMode" == "cluster" ]; then
-        nginx_service_config="${service_config_dir}/${nginx_service_name}.service"
-        if [ -d ${install_nginxd_dir} ]; then
-            if systemctl is-active --quiet ${nginx_service_name}; then
-                echo "Nginx for TDengine is running, stopping it..."
-                ${csudo}systemctl stop ${nginx_service_name} &> /dev/null || echo &> /dev/null
-            fi
-            ${csudo}systemctl disable ${nginx_service_name} &> /dev/null || echo &> /dev/null
-            ${csudo}rm -f ${nginx_service_config}
-        fi
+  tarbitratord_service_config="${service_config_dir}/${tarbitrator_service_name}.service"
+  if systemctl is-active --quiet ${tarbitrator_service_name}; then
+    echo "TDengine tarbitrator is running, stopping it..."
+    ${csudo}systemctl stop ${tarbitrator_service_name} &>/dev/null || echo &>/dev/null
+  fi
+  ${csudo}systemctl disable ${tarbitrator_service_name} &>/dev/null || echo &>/dev/null
+  ${csudo}rm -f ${tarbitratord_service_config}
+
+  if [ "$verMode" == "cluster" ]; then
+    nginx_service_config="${service_config_dir}/${nginx_service_name}.service"
+    if [ -d ${install_nginxd_dir} ]; then
+      if systemctl is-active --quiet ${nginx_service_name}; then
+        echo "Nginx for TDengine is running, stopping it..."
+        ${csudo}systemctl stop ${nginx_service_name} &>/dev/null || echo &>/dev/null
+      fi
+      ${csudo}systemctl disable ${nginx_service_name} &>/dev/null || echo &>/dev/null
+      ${csudo}rm -f ${nginx_service_config}
     fi
+  fi
 }
 
 function clean_service_on_sysvinit() {
-    #restart_config_str="taos:2345:respawn:${service_config_dir}/taosd start"
-    #${csudo}sed -i "\|${restart_config_str}|d" /etc/inittab || :
+  #restart_config_str="taos:2345:respawn:${service_config_dir}/taosd start"
+  #${csudo}sed -i "\|${restart_config_str}|d" /etc/inittab || :
 
-    if pidof taosd &> /dev/null; then
-        echo "TDengine taosd is running, stopping it..."
-        ${csudo}service taosd stop || :
-    fi
+  if pidof taosd &>/dev/null; then
+    echo "TDengine taosd is running, stopping it..."
+    ${csudo}service taosd stop || :
+  fi
 
-    if pidof tarbitrator &> /dev/null; then
-        echo "TDengine tarbitrator is running, stopping it..."
-        ${csudo}service tarbitratord stop || :
-    fi
+  if pidof tarbitrator &>/dev/null; then
+    echo "TDengine tarbitrator is running, stopping it..."
+    ${csudo}service tarbitratord stop || :
+  fi
 
-    if ((${initd_mod}==1)); then
-      if [ -e ${service_config_dir}/taosd ]; then
-        ${csudo}chkconfig --del taosd || :
-      fi
-      if [ -e ${service_config_dir}/tarbitratord ]; then
-        ${csudo}chkconfig --del tarbitratord || :
-      fi
-    elif ((${initd_mod}==2)); then
-      if [ -e ${service_config_dir}/taosd ]; then
-        ${csudo}insserv -r taosd || :
-      fi
-      if [ -e ${service_config_dir}/tarbitratord ]; then
-        ${csudo}insserv -r tarbitratord || :
-      fi
-    elif ((${initd_mod}==3)); then
-      if [ -e ${service_config_dir}/taosd ]; then
-        ${csudo}update-rc.d -f taosd remove || :
-      fi
-      if [ -e ${service_config_dir}/tarbitratord ]; then
-        ${csudo}update-rc.d -f tarbitratord remove || :
-      fi
+  if ((${initd_mod} == 1)); then
+    if [ -e ${service_config_dir}/taosd ]; then
+      ${csudo}chkconfig --del taosd || :
+    fi
+    if [ -e ${service_config_dir}/tarbitratord ]; then
+      ${csudo}chkconfig --del tarbitratord || :
+    fi
+  elif ((${initd_mod} == 2)); then
+    if [ -e ${service_config_dir}/taosd ]; then
+      ${csudo}insserv -r taosd || :
     fi
+    if [ -e ${service_config_dir}/tarbitratord ]; then
+      ${csudo}insserv -r tarbitratord || :
+    fi
+  elif ((${initd_mod} == 3)); then
+    if [ -e ${service_config_dir}/taosd ]; then
+      ${csudo}update-rc.d -f taosd remove || :
+    fi
+    if [ -e ${service_config_dir}/tarbitratord ]; then
+      ${csudo}update-rc.d -f tarbitratord remove || :
+    fi
+  fi
 
-    ${csudo}rm -f ${service_config_dir}/taosd || :
-    ${csudo}rm -f ${service_config_dir}/tarbitratord || :
+  ${csudo}rm -f ${service_config_dir}/taosd || :
+  ${csudo}rm -f ${service_config_dir}/tarbitratord || :
 
-    if $(which init &> /dev/null); then
-        ${csudo}init q || :
-    fi
+  if $(which init &>/dev/null); then
+    ${csudo}init q || :
+  fi
 }
 
 function clean_service() {
-    if ((${service_mod}==0)); then
-        clean_service_on_systemd
-    elif ((${service_mod}==1)); then
-        clean_service_on_sysvinit
-    else
-        # must manual stop taosd
-        kill_taosadapter
-        kill_taosd
-        kill_tarbitrator
-    fi
+  if ((${service_mod} == 0)); then
+    clean_service_on_systemd
+  elif ((${service_mod} == 1)); then
+    clean_service_on_sysvinit
+  else
+    # must manual stop taosd
+    kill_taosadapter
+    kill_taosd
+    kill_tarbitrator
+  fi
 }
 
 # Stop service and disable booting start.
@@ -221,7 +221,7 @@ clean_log
 # Remove link configuration file
 clean_config
 # Remove data link directory
-${csudo}rm -rf ${data_link_dir}    || :
+${csudo}rm -rf ${data_link_dir} || :
 
 ${csudo}rm -rf ${install_main_dir}
 ${csudo}rm -rf ${install_nginxd_dir}
@@ -231,15 +231,15 @@ else
   osinfo=""
 fi
 
-if echo $osinfo | grep -qwi "ubuntu" ; then
-#  echo "this is ubuntu system"
-   ${csudo}dpkg --force-all  -P tdengine > /dev/null 2>&1 || :
-elif echo $osinfo | grep -qwi "debian" ; then
-#  echo "this is debian system"
-   ${csudo}dpkg --force-all  -P tdengine > /dev/null 2>&1 || :
-elif  echo $osinfo | grep -qwi "centos" ; then
-#  echo "this is centos system"
-  ${csudo}rpm -e --noscripts tdengine > /dev/null 2>&1 || :
+if echo $osinfo | grep -qwi "ubuntu"; then
+  #  echo "this is ubuntu system"
+  ${csudo}dpkg --force-all -P tdengine >/dev/null 2>&1 || :
+elif echo $osinfo | grep -qwi "debian"; then
+  #  echo "this is debian system"
+  ${csudo}dpkg --force-all -P tdengine >/dev/null 2>&1 || :
+elif echo $osinfo | grep -qwi "centos"; then
+  #  echo "this is centos system"
+  ${csudo}rpm -e --noscripts tdengine >/dev/null 2>&1 || :
 fi
 
 echo -e "${GREEN}TDengine is removed successfully!${NC}"