Skip to content

Commit

Permalink
Merge remote-tracking branch 'origin/main'
Browse files Browse the repository at this point in the history
# Conflicts:
#	src/AdminifyServiceProvider.php
#	src/Commands/InstallationCommand.php
  • Loading branch information
GeorgeFourkas committed Apr 5, 2024
2 parents a960210 + b84c773 commit d9605a6
Showing 1 changed file with 5 additions and 5 deletions.
10 changes: 5 additions & 5 deletions src/Commands/PrintResourceFileList.php
Original file line number Diff line number Diff line change
Expand Up @@ -31,16 +31,16 @@ private function listFolderFiles($dir): void

foreach ($ffs as $ff) {

if (is_dir($dir . '/' . $ff)) {
$this->listFolderFiles($dir . '/' . $ff);
if (is_dir($dir.'/'.$ff)) {
$this->listFolderFiles($dir.'/'.$ff);
}

$fullPath = $dir . '/' . $ff;
$fullPath = $dir.'/'.$ff;

$path = explode('resources', $fullPath);
$pathFromResources = 'resources' . end($path);
$pathFromResources = 'resources'.end($path);
if (str_contains($pathFromResources, '.')) {
$this->info("'" . str_replace('\\', '/', $pathFromResources) . "',");
$this->info("'".str_replace('\\', '/', $pathFromResources)."',");
}
}
}
Expand Down

0 comments on commit d9605a6

Please sign in to comment.