Merge pull request #16544 from taosdata/test/chr/TD-14699

test: modify checkpackages scritps

packaging/testpackage.sh

@@ -104,6 +104,10 @@ else
     echoColor YD "${installPath} already exists"
 fi
 
+if [ -d ${installPath}/${tdPath} ] ;then
+    echoColor BD "rm -rf ${installPath}/${tdPath}/*"
+    rm -rf ${installPath}/${tdPath}/*
+fi
 
 if [ ! -d ${oriInstallPath} ] ;then
     echoColor BD "mkdir -p ${oriInstallPath}"
@@ -112,7 +116,10 @@ else
     echoColor YD "${oriInstallPath} already exists"
 fi
 
-
+if [ -d ${oriInstallPath}/${originTdpPath} ] ;then
+    echoColor BD "rm -rf ${oriInstallPath}/${originTdpPath}/*"
+    rm -rf  ${oriInstallPath}/${originTdpPath}/*  
+fi
 
 
 echoColor G "===== download  installPackage ====="
@@ -170,24 +177,13 @@ elif [[ ${packgeName} =~ "rpm" ]];then
         echoColor BD "rpm  -ivh ${packgeName}" &&   rpm  -ivh ${packgeName}
     fi
 elif [[ ${packgeName} =~ "tar" ]];then
-    cd ${installPath}/${tdPath}
-    if [ ${testFile} = "server" ];then
-        echoColor BD "bash ${installCmd}  -e no  "
-        bash ${installCmd}  -e no  
-    else
-        echoColor BD "bash ${installCmd} "
-        bash ${installCmd} 
-    fi
-
     echoColor G "===== check installPackage File of tar ====="
-
     cd  ${oriInstallPath}
     if [ ! -f  {originPackageName}  ];then
         echoColor YD "download  base installPackage"
         echoColor BD "sshpass -p ${password} scp 192.168.1.131:/nas/TDengine3/v${originversion}/community/${originPackageName} ."
         sshpass -p ${password} scp 192.168.1.131:/nas/TDengine3/v${originversion}/community/${originPackageName} .
     fi
-
     echoColor YD "unzip the base installation package" 
     echoColor BD "tar -xf ${originPackageName}" && tar -xf ${originPackageName} 
     cd ${installPath} 
@@ -205,29 +201,41 @@ elif [[ ${packgeName} =~ "tar" ]];then
     cd ${installPath} 
     diff  ${installPath}/base_${originversion}_checkfile   ${installPath}/now_${version}_checkfile  > ${installPath}/diffFile.log
     diffNumbers=`cat ${installPath}/diffFile.log |wc -l `
+
     if [ ${diffNumbers} != 0 ];then
-        echoColor R "The number and names of files have changed from the previous installation package"
+        echoColor R "The number and names of files is different from the previous installation package"
         echoColor Y `cat ${installPath}/diffFile.log`
         exit -1
     else 
         echoColor G "The number and names of files are the same as previous installation packages"
     fi
+    echoColor YD  "===== install Package of tar ====="
+    cd ${installPath}/${tdPath}
+    if [ ${testFile} = "server" ];then
+        echoColor BD "bash ${installCmd}  -e no  "
+        bash ${installCmd}  -e no  
+    else
+        echoColor BD "bash ${installCmd} "
+        bash ${installCmd} 
+    fi
 fi  
 
-echoColor G "===== install taos-tools when package is lite or client ====="
 
 
 if ([[ ${packgeName} =~ "Lite" ]] &&  [[ ${packgeName} =~ "tar" ]]) ||   [[ ${packgeName} =~ "client" ]] ;then
+    echoColor G "===== install taos-tools when package is lite or client ====="
     cd ${installPath}
     sshpass -p ${password}   scp 192.168.1.131:/nas/TDengine3/v${version}/community/taosTools-2.1.2-Linux-x64.tar.gz .
     # wget https://www.taosdata.com/assets-download/3.0/taosTools-2.1.2-Linux-x64.tar.gz
     tar xf taosTools-2.1.2-Linux-x64.tar.gz
     cd taosTools-2.1.2 && bash install-taostools.sh
 elif [[ ${packgeName} =~ "Lite" ]] &&  [[ ${packgeName} =~ "deb" ]] ;then
+    echoColor G "===== install taos-tools when package is lite or client ====="
     cd ${installPath}
     sshpass -p ${password}   scp 192.168.1.131:/nas/TDengine3/v${version}/community/taosTools-2.1.2-Linux-x64.deb .
     dpkg -i taosTools-2.1.2-Linux-x64.deb 
 elif [[ ${packgeName} =~ "Lite" ]] &&  [[ ${packgeName} =~ "rpm" ]]  ;then
+    echoColor G "===== install taos-tools when package is lite or client ====="
     cd ${installPath}
     sshpass -p ${password}   scp 192.168.1.131:/nas/TDengine3/v${version}/community/taosTools-2.1.2-Linux-x64.rpm .
     rpm -ivh taosTools-2.1.2-Linux-x64.rpm --quiet