From e35ce011630cbb21793e637912727591e6575642 Mon Sep 17 00:00:00 2001
From: lai <371757574@qq.com>
Date: Thu, 21 Nov 2024 10:45:41 +0800
Subject: [PATCH 1/2] update time

---
 extra/emsVersion | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/extra/emsVersion b/extra/emsVersion
index 17ac5be..269b5ec 100644
--- a/extra/emsVersion
+++ b/extra/emsVersion
@@ -1,2 +1,2 @@
 Version:emsInstall r2411.1
-Release Date: 2024-11-20 19:00:00
+Release Date: 2024-11-21 12:00:00

From ca57c754a3513873b0723e0ce7d9c02a9cf05cc1 Mon Sep 17 00:00:00 2001
From: lai <371757574@qq.com>
Date: Thu, 21 Nov 2024 10:51:47 +0800
Subject: [PATCH 2/2] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E8=84=9A=E6=9C=AC?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 extra/wxc2_emsInstall | 22 +++++++++++++---------
 1 file changed, 13 insertions(+), 9 deletions(-)

diff --git a/extra/wxc2_emsInstall b/extra/wxc2_emsInstall
index fc9cfe5..6b9e697 100644
--- a/extra/wxc2_emsInstall
+++ b/extra/wxc2_emsInstall
@@ -408,7 +408,7 @@ if [ "$installMode" == "2" ] ; then
     # only copy bin file exclude subdirectory (conf, mib, ...)
     find $srcBinDir -maxdepth 1 -type f -exec cp -f {}  $dstBinDir \;
     # update subdirectory mib, daul.
-    cp -rf $srcBinDir/mib $dstBinDir/mib
+    cp -rf $srcBinDir/mib/* $dstBinDir/mib
     cp -rf $srcBinDir/dual $dstBinDir/dual
     chmod +x $dstBinDir/*
     myShowResult "OK"
@@ -551,14 +551,18 @@ needCopyDirList=`ls $srcDataDir`
 #done 
 
 # by 2024/08/30 lai:order to keep sysUser 
-for tmpDir in $needCopyDirList ; do
-     	if [[ $tmpDir == "OMC_PUB" ]]; then
-	    	mkdir -p $dstDataDir/$tmpDir
-	find $srcDataDir/$tmpDir -type f ! -name 'sysUser.MYD' ! -name 'sysUser.MYI' ! -name 'sysUser.frm' -exec cp -Rf {} $dstDataDir/$tmpDir/ \;
-	else
-	       cp -Rf $srcDataDir/$tmpDir $dstDataDir/
-	 fi
-	 echo -n "."
+for tmpDir in $needCopyDirList; do
+    if [[ $tmpDir == "OMC_PUB" ]]; then
+        mkdir -p "$dstDataDir/$tmpDir"
+        if [[ ! -e "$dstDataDir/$tmpDir/sysUser.MYD" && ! -e "$dstDataDir/$tmpDir/sysUser.MYI" && ! -e "$dstDataDir/$tmpDir/sysUser.frm" ]]; then
+            cp -Rf "$srcDataDir/$tmpDir/"* "$dstDataDir/$tmpDir/"
+        else
+            find "$srcDataDir/$tmpDir" -type f ! -name 'sysUser.MYD' ! -name 'sysUser.MYI' ! -name 'sysUser.frm' -exec cp -Rf {} "$dstDataDir/$tmpDir/" \;
+        fi
+    else
+        cp -Rf "$srcDataDir/$tmpDir" "$dstDataDir/"
+    fi
+    echo -n "."
 done