Merge branch 'develop' into fix/TS-550

packaging/tools/install.sh

@@ -455,7 +455,7 @@ function install_blm3_config() {
     fi
 
     [ -f ${script_dir}/cfg/blm.toml ] &&
-        ${csudo} cp -f ${script_dir}/cfg/blm.toml ${install_main_dir}/cfg/blm.toml.org
+        ${csudo} cp -f ${script_dir}/cfg/blm.toml ${cfg_install_dir}/blm.toml.new
 
     [ -f ${cfg_install_dir}/blm.toml ] &&
         ${csudo} ln -s ${cfg_install_dir}/blm.toml ${install_main_dir}/cfg/blm.toml
@@ -473,7 +473,7 @@ function install_config() {
         ${csudo} chmod 644 ${cfg_install_dir}/*
     fi
 
-    ${csudo} cp -f ${script_dir}/cfg/taos.cfg ${install_main_dir}/cfg/taos.cfg.org
+    ${csudo} cp -f ${script_dir}/cfg/taos.cfg ${cfg_install_dir}/taos.cfg.new
     ${csudo} ln -s ${cfg_install_dir}/taos.cfg ${install_main_dir}/cfg
 
     [ ! -z $1 ] && return 0 || : # only install client

packaging/tools/make_install.sh

@@ -351,15 +351,13 @@ function install_config() {
         [ -f ${script_dir}/../cfg/taos.cfg ] &&
         ${csudo} cp ${script_dir}/../cfg/taos.cfg ${cfg_install_dir}
         ${csudo} chmod 644 ${cfg_install_dir}/taos.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/taos.cfg
+        ${csudo} cp -f ${script_dir}/../cfg/taos.cfg \
+            ${cfg_install_dir}/taos.cfg.${verNumber}
+        ${csudo} ln -s ${cfg_install_dir}/taos.cfg \
+            ${install_main_dir}/cfg/taos.cfg
     else
-        if [ "$osType" != "Darwin" ]; then
-            ${csudo} cp -f ${script_dir}/../cfg/taos.cfg ${install_main_dir}/cfg/taos.cfg.org
-        else
-            ${csudo} cp -f ${script_dir}/../cfg/taos.cfg ${install_main_dir}/cfg/taos.cfg.org\
-                || ${csudo} cp -f ${script_dir}/../cfg/taos.cfg ${install_main_2_dir}/cfg/taos.cfg.org
-        fi
+        ${csudo} cp -f ${script_dir}/../cfg/taos.cfg \
+            ${cfg_install_dir}/taos.cfg.${verNumber}
     fi
 }
 
@@ -371,19 +369,15 @@ function install_blm3_config() {
         [ -f ${cfg_install_dir}/blm.toml ] &&
             ${csudo} chmod 644 ${cfg_install_dir}/blm.toml
         [ -f ${binary_dir}/test/cfg/blm.toml ] &&
-            ${csudo} cp -f ${binary_dir}/test/cfg/blm.toml ${install_main_dir}/cfg/blm.toml.org
-        [ -f ${cfg_install_dir}/blm.toml ] &&
-            ${csudo} ln -s ${cfg_install_dir}/blm.toml ${install_main_dir}/cfg/blm.toml
+            ${csudo} cp -f ${binary_dir}/test/cfg/blm.toml \
+                ${cfg_install_dir}/blm.toml.${verNumber}
+        [ -f ${cfg_install_dir}/blm.toml ] && \
+            ${csudo} ln -s ${cfg_install_dir}/blm.toml \
+            ${install_main_dir}/cfg/blm.toml
     else
         if [ -f "${binary_dir}/test/cfg/blm.toml" ]; then
-            if [ "$osType" != "Darwin" ]; then
-                ${csudo} cp -f ${binary_dir}/test/cfg/blm.toml \
-                    ${install_main_dir}/cfg/blm.toml.org
-            else
-                ${csudo} cp -f ${binary_dir}/test/cfg/blm.toml ${install_main_dir}/cfg/blm.toml.org \
-                    || ${csudo} cp -f ${binary_dir}/test/cfg/blm.toml \
-                    ${install_main_2_dir}/cfg/blm.toml.org
-            fi
+            ${csudo} cp -f ${binary_dir}/test/cfg/blm.toml \
+                ${cfg_install_dir}/blm.toml.${verNumber}
         fi
     fi
 }

packaging/tools/post.sh

@@ -301,7 +301,7 @@ function install_blm3_config() {
     fi
 
     [ -f ${cfg_dir}/blm.toml ] &&
-        ${csudo} mv ${cfg_dir}/blm.toml ${cfg_dir}/blm.toml.org
+        ${csudo} mv ${cfg_dir}/blm.toml ${cfg_dir}/blm.toml.new
 
     [ -f ${cfg_install_dir}/blm.toml ] &&
         ${csudo} ln -s ${cfg_install_dir}/blm.toml ${cfg_dir}
@@ -322,7 +322,7 @@ function install_config() {
     # restore the backup standard input, and turn off 6
     exec 0<&6 6<&-
 
-    ${csudo} mv ${cfg_dir}/taos.cfg ${cfg_dir}/taos.cfg.org
+    ${csudo} mv ${cfg_dir}/taos.cfg ${cfg_dir}/taos.cfg.new
     ${csudo} ln -s ${cfg_install_dir}/taos.cfg ${cfg_dir}
     #FQDN_FORMAT="(25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)"
     #FQDN_FORMAT="(:[1-6][0-9][0-9][0-9][0-9]$)"

packaging/tools/preun.sh

@@ -124,7 +124,7 @@ ${csudo} rm -f ${bin_link_dir}/blm3       || :
 ${csudo} rm -f ${bin_link_dir}/taosdemo   || :
 ${csudo} rm -f ${bin_link_dir}/taosdump   || :
 ${csudo} rm -f ${bin_link_dir}/set_core   || :
-${csudo} rm -f ${cfg_link_dir}/*          || :
+${csudo} rm -f ${cfg_link_dir}/*.new      || :
 ${csudo} rm -f ${inc_link_dir}/taos.h     || :
 ${csudo} rm -f ${inc_link_dir}/taoserror.h || :
 ${csudo} rm -f ${lib_link_dir}/libtaos.*   || :

packaging/tools/startPre.sh

@@ -9,8 +9,8 @@ line=`grep StartLimitBurst ${taosd}`
 num=${line##*=}
 #echo "burst num: ${num}"
 
-startSeqFile=/usr/local/taos/.startSeq
-recordFile=/usr/local/taos/.startRecord
+startSeqFile=/var/log/taos/.startSeq
+recordFile=/var/log/taos/.startRecord
 
 startSeq=0