Forward-port #1006 changes

This commit is contained in:
crazywhalecc
2026-02-05 19:21:13 +08:00
parent 8fc2da9acf
commit 97634b009f
7 changed files with 49 additions and 22 deletions

View File

@@ -314,12 +314,7 @@ class FileSystem
continue;
}
$sub_file = self::convertPath($dir . '/' . $v);
if (is_dir($sub_file)) {
# 如果是 目录 且 递推 , 则递推添加下级文件
if (!self::removeDir($sub_file)) {
return false;
}
} elseif (is_link($sub_file) || is_file($sub_file)) {
if (is_link($sub_file) || is_file($sub_file)) {
if (!unlink($sub_file)) {
$cmd = PHP_OS_FAMILY === 'Windows' ? 'del /f /q' : 'rm -f';
f_exec("{$cmd} " . escapeshellarg($sub_file), $out, $ret);
@@ -328,6 +323,11 @@ class FileSystem
return false;
}
}
} elseif (is_dir($sub_file)) {
# 如果是 目录 且 递推 , 则递推添加下级文件
if (!self::removeDir($sub_file)) {
return false;
}
}
}
if (is_link($dir)) {