From 7ce3823a9cd127c584b2dfd916017fbdd4a7e679 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E7=8E=8B=E6=80=A1=E6=A0=8B?= <wangyidong@cnezsoft.com>
Date: Wed, 25 Aug 2021 09:39:26 +0800
Subject: [PATCH]  * finish task #41678.

---
 module/upgrade/lang/en.php    | 2 +-
 module/upgrade/lang/zh-cn.php | 2 +-
 module/upgrade/model.php      | 7 ++++---
 3 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/module/upgrade/lang/en.php b/module/upgrade/lang/en.php
index 3201aa5aa5..7f1868520d 100644
--- a/module/upgrade/lang/en.php
+++ b/module/upgrade/lang/en.php
@@ -50,7 +50,7 @@ $lang->upgrade->sureExecute   = 'Execute';
 $lang->upgrade->forbiddenExt  = 'The extension is incompatible with the version. It has been deactivated:';
 $lang->upgrade->updateFile    = 'File information has to be updated.';
 $lang->upgrade->noticeSQL     = 'Your database is inconsistent with the standard and it failed to fix it. Please run the following SQL and refresh.';
-$lang->upgrade->afterDeleted  = 'File is not deleted. Please refresh after you delete it.';
+$lang->upgrade->afterDeleted  = 'Please execute commands to delete the files. Please refresh after you delete them.';
 $lang->upgrade->mergeProgram  = 'Data Merge';
 $lang->upgrade->mergeTips     = 'Data Migration Tips';
 $lang->upgrade->toPMS15Guide  = 'ZenTao open source version 15 upgrade';
diff --git a/module/upgrade/lang/zh-cn.php b/module/upgrade/lang/zh-cn.php
index e879dddf9b..deb6a56cfc 100644
--- a/module/upgrade/lang/zh-cn.php
+++ b/module/upgrade/lang/zh-cn.php
@@ -50,7 +50,7 @@ $lang->upgrade->sureExecute    = '确认执行';
 $lang->upgrade->forbiddenExt   = '以下插件与新版本不兼容，已经自动禁用：';
 $lang->upgrade->updateFile     = '需要更新附件信息。';
 $lang->upgrade->noticeSQL      = '检查到你的数据库跟标准不一致，尝试修复失败。请执行以下SQL语句，再刷新页面检查。';
-$lang->upgrade->afterDeleted   = '以上文件未能删除， 删除后刷新！';
+$lang->upgrade->afterDeleted   = '请执行上面命令删除文件， 删除后刷新！';
 $lang->upgrade->mergeProgram   = '数据迁移';
 $lang->upgrade->mergeTips      = '数据迁移提示';
 $lang->upgrade->toPMS15Guide   = '禅道开源版15版本升级';
diff --git a/module/upgrade/model.php b/module/upgrade/model.php
index aacf260b20..3a388b04cc 100644
--- a/module/upgrade/model.php
+++ b/module/upgrade/model.php
@@ -1050,10 +1050,11 @@ class upgradeModel extends model
                 $fullPath = $basePath . str_replace('/', DIRECTORY_SEPARATOR, $file);
                 if(file_exists($fullPath))
                 {
-                    if((is_dir($fullPath)  and !$zfile->removeDir($fullPath)) or
-                       (is_file($fullPath) and !$zfile->removeFile($fullPath)))
+                    $isDir = is_dir($fullPath);
+                    if(($isDir  and !$zfile->removeDir($fullPath)) or
+                       (!$isDir and !$zfile->removeFile($fullPath)))
                     {
-                        $result[] = $fullPath;
+                        $result[] = 'rm -f ' . ($isDir ? '-r ' : '') . $fullPath;
                     }
                 }
             }