SuiteCRM/SuiteCRM-Core
2
0
Fork 0
mirror of https://github.com/SuiteCRM/SuiteCRM-Core.git synced 2025-08-29 11:00:40 +08:00
Code Issues Projects Packages Activity Actions

Fix cli build issues

Browse source 
Missing directories not being created
Gitkeep being removed on build
Inappropriate permissions being set
This commit is contained in:
Matt Lorimer 2019-12-18 18:00:08 +00:00 • committed by Dillon-Brown
parent c895877b7e
commit 3b8ea00969
3 changed files with 51 additions and 26 deletions
Download patch file Download diff file Expand all files Collapse all files

14
core/base/Helper/File/File.php
View file

@ -15,7 +15,7 @@ class File
/**
* Get all directories in a path
*
* @param $paths Array of paths
* @param $paths array of paths
* @return array All directories in paths
*/
public function findDirectories($paths): array
@ -47,7 +47,7 @@ class File
* @param int $permissions octal
* @return bool
*/
public function makeDir($path, $permissions = 0777): bool
public function makeDir($path, $permissions = 0755): bool
{
return is_dir($path) || mkdir($path, $permissions, true) || is_dir($path);
}
@ -114,6 +114,10 @@ class File
foreach ($directories as $directory) {
$directory = realpath($directory);
if (!is_dir($directory)) {
continue;
}
$objDirectory = new RecursiveDirectoryIterator($directory, RecursiveDirectoryIterator::SKIP_DOTS);
$iterator = new RecursiveIteratorIterator($objDirectory);
@ -141,15 +145,15 @@ class File
if (!is_dir($dst)) {
try {
if (!mkdir($dst) && !is_dir($dst)) {
if (!mkdir($dst, 0755, true) && !is_dir($dst)) {
throw new \RuntimeException(sprintf('Directory "%s" was not created', $dst));
}
} catch (\Exception $e) {
throw new \RuntimeException(sprintf('Directory "%s" was not created', $dst));
throw new \RuntimeException($e->getMessage());
}
}
chmod($dst, 0777);
chmod($dst, 0755);
while (false !== ($file = \readdir($dir))) {
if (($file !== '.') && ($file !== '..')) {