change

packaging/sed_pro.sh

@@ -60,34 +60,13 @@ function replace_community_pro() {
   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_link_dir}\/rmtaos /\${bin_link_dir}\/rmpro /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
-  sed -i "s/systemctl enable taosd/systemctl enable prodbs/g" ${top_dir}/packaging/tools/install.sh
-  sed -i "s/kill_process taosd/kill_process prodbs/g" ${top_dir}/packaging/tools/install.sh
-  sed -i "s/: taosd/: prodbs/g" ${top_dir}/packaging/tools/install.sh
+  sed -i "s/clientName=\"taos\"/clientName=\"prodbc\"/g" ${top_dir}/packaging/tools/install.sh
+  sed -i "s/serverName=\"taosd\"/serverName=\"prodbs\"/g" ${top_dir}/packaging/tools/install.sh
+  sed -i "s/configFile=\"taos\.cfg\"/configFile=\"prodb\.cfg\"/g" ${top_dir}/packaging/tools/install.sh
+  sed -i "s/productName=\"TDengine\"/productName=\"ProDB\"/g" ${top_dir}/packaging/tools/install.sh
+  sed -i "s/emailName=\"taosdata\.com\"/emailName=\"\hanatech\.com\.cn\"/g" ${top_dir}/packaging/tools/install.sh
+  sed -i "s/uninstallScript=\"rmtaos\"/uninstallScript=\"rmpro\"/g" ${top_dir}/packaging/tools/install.sh
+  sed -i "s/historyFile=\"taos_history\"/historyFile=\"prodb_history\"/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
@@ -115,7 +94,6 @@ function replace_community_pro() {
   sed -i "s/startSeqFile=\/var\/log\/taos\/\.startSeq/startSeqFile=\/var\/log\/ProDB\/\.startSeq/g" ${top_dir}/packaging/tools/startPre.sh
   sed -i "s/recordFile=\/var\/log\/taos\/\.startRecord/recordFile=\/var\/log\/ProDB\/\.startRecord/g" ${top_dir}/packaging/tools/startPre.sh
 
-
 }
 
 function replace_enterprise_pro() {

packaging/tools/makeclient.sh

@@ -14,6 +14,11 @@ verMode=$6
 verType=$7
 pagMode=$8
 
+clientName="taos"
+configFile="taos.cfg"
+tarName="taos.tar.gz"
+productName="TDengine"
+
 if [ "$osType" != "Darwin" ]; then
     script_dir="$(dirname $(readlink -f $0))"
     top_dir="$(readlink -f ${script_dir}/../..)"
@@ -32,29 +37,27 @@ release_dir="${top_dir}/release"
 #package_name='linux'
 
 if [ "$verMode" == "cluster" ]; then
-    install_dir="${release_dir}/TDengine-enterprise-client-${version}"
+    install_dir="${release_dir}/${productName}-enterprise-client-${version}"
 else
-    install_dir="${release_dir}/TDengine-client-${version}"
+    install_dir="${release_dir}/${productName}-client-${version}"
 fi
 
 # Directories and files.
 
 if [ "$osType" != "Darwin" ]; then
   if [ "$pagMode" == "lite" ]; then
-    #strip ${build_dir}/bin/taosd
-    strip ${build_dir}/bin/taos
-    bin_files="${build_dir}/bin/taos \
+    strip ${build_dir}/bin/${clientName}
+    bin_files="${build_dir}/bin/${clientName} \
         ${script_dir}/remove_client.sh"
   else
-    bin_files="${build_dir}/bin/taos \
+    bin_files="${build_dir}/bin/${clientName} \
         ${script_dir}/remove_client.sh \
         ${script_dir}/set_core.sh \
         ${script_dir}/get_client.sh"
-        #${script_dir}/get_client.sh ${script_dir}/taosd-dump-cfg.gdb"
   fi
   lib_files="${build_dir}/lib/libtaos.so.${version}"
 else
-  bin_files="${build_dir}/bin/taos ${script_dir}/remove_client.sh"
+  bin_files="${build_dir}/bin/${clientName} ${script_dir}/remove_client.sh"
   lib_files="${build_dir}/lib/libtaos.${version}.dylib"
 fi
 
@@ -70,7 +73,7 @@ install_files="${script_dir}/install_client.sh"
 # make directories.
 mkdir -p ${install_dir}
 mkdir -p ${install_dir}/inc && cp ${header_files} ${install_dir}/inc
-mkdir -p ${install_dir}/cfg && cp ${cfg_dir}/taos.cfg ${install_dir}/cfg/taos.cfg
+mkdir -p ${install_dir}/cfg && cp ${cfg_dir}/${configFile} ${install_dir}/cfg/${configFile}
 mkdir -p ${install_dir}/bin && cp ${bin_files} ${install_dir}/bin && chmod a+x ${install_dir}/bin/*
 
 if [ -f ${build_dir}/bin/jemalloc-config ]; then
@@ -109,12 +112,12 @@ fi
 cd ${install_dir}
 
 if [ "$osType" != "Darwin" ]; then
-    tar -zcv -f taos.tar.gz * --remove-files || :
+    tar -zcv -f ${tarName} * --remove-files || :
 else
-    tar -zcv -f taos.tar.gz * || :
-    mv taos.tar.gz ..
+    tar -zcv -f ${tarName} * || :
+    mv ${tarName} ..
     rm -rf ./*
-    mv ../taos.tar.gz .
+    mv ../${tarName} .
 fi
 
 cd ${curr_dir}
@@ -165,22 +168,11 @@ fi
 # Copy release note
 # cp ${script_dir}/release_note ${install_dir}
 
-# exit 1
-
 cd ${release_dir}
 
 #  install_dir has been distinguishes  cluster from  edege, so comments this code
 pkg_name=${install_dir}-${osType}-${cpuType}
 
-# if [ "$verMode" == "cluster" ]; then
-#   pkg_name=${install_dir}-${osType}-${cpuType}
-# elif [ "$verMode" == "edge" ]; then
-#   pkg_name=${install_dir}-${osType}-${cpuType}
-# else
-#   echo "unknow verMode, nor cluster or edge"
-#   exit 1
-# fi
-
 if [[ "$verType" == "beta" ]] || [[ "$verType" == "preRelease" ]]; then
   pkg_name=${install_dir}-${verType}-${osType}-${cpuType}
 elif [ "$verType" == "stable" ]; then

packaging/tools/makepkg.sh

@@ -29,37 +29,37 @@ if [ $dbName == "power" ]; then
   productName="PowerDB"
   serverName="powerd"
   clientName="power"
-  cfgDirName="power.cfg"
+  configDir="power.cfg"
   tarName="power.tar.gz"
 elif [ $dbName == "tq" ]; then
   productName="TQ"
   serverName="tqd"
   clientName="tq"
-  cfgDirName="tq.cfg"
+  configDir="tq.cfg"
   tarName="tq.tar.gz"
 elif [ $dbName == "pro" ]; then
   productName="ProDB"
   serverName="prodbs"
   clientName="prodbc"
-  cfgDirName="prodb.cfg"
+  configDir="prodb.cfg"
   tarName="prodb.tar.gz"
 elif [ $dbName == "kh" ]; then
   productName="KingHistorian"
   serverName="khserver"
   clientName="khclient"
-  cfgDirName="kinghistorian.cfg"
+  configDir="kinghistorian.cfg"
   tarName="kinghistorian.tar.gz"
 elif [ $dbName == "jh" ]; then
   productName="jh_iot"
   serverName="jh_taosd"
   clientName="jh_taos"
-  cfgDirName="jh_taos.cfg"
+  configDir="jh_taos.cfg"
   tarName="jh_taos.tar.gz"
 else
   productName="TDengine"
   serverName="taosd"
   clientName="taos"
-  cfgDirName="taos.cfg"
+  configDir="taos.cfg"
   tarName="taos.tar.gz"
 fi
 
@@ -123,7 +123,7 @@ init_file_tarbitrator_rpm=${script_dir}/../rpm/tarbitratord
 # make directories.
 mkdir -p ${install_dir}
 mkdir -p ${install_dir}/inc && cp ${header_files} ${install_dir}/inc
-mkdir -p ${install_dir}/cfg && cp ${cfg_dir}/${cfgDirName} ${install_dir}/cfg/${cfgDirName}
+mkdir -p ${install_dir}/cfg && cp ${cfg_dir}/${configDir} ${install_dir}/cfg/${configDir}
 
 if [ -f "${compile_dir}/test/cfg/taosadapter.toml" ]; then
   cp ${compile_dir}/test/cfg/taosadapter.toml ${install_dir}/cfg || :