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