diogo/symfony
Archived
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

[Finder] Fixed filename containing space bug in gnu adapter.

Browse Source
This commit is contained in:
Jean-François Simon 2012-10-29 08:03:45 +01:00
parent 9bf7cb0941
commit 2817a47367
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/Symfony/Component/Finder/Adapter/GnuFindAdapter.php
View File

@ -84,7 +84,7 @@ class GnuFindAdapter extends AbstractAdapter
$this->buildDatesFiltering($find, $this->dates);
$useGrep = $this->shell->testCommand('grep') && $this->shell->testCommand('xargs');
$useSort = is_int($this->sort) && $this->shell->testCommand('sort') && $this->shell->testCommand('awk');
$useSort = is_int($this->sort) && $this->shell->testCommand('sort') && $this->shell->testCommand('cut');
if ($useGrep && ($this->contains || $this->notContains)) {
$grep = $command->ins('grep');
@ -286,8 +286,8 @@ class GnuFindAdapter extends AbstractAdapter
{
switch ($sort) {
case SortableIterator::SORT_BY_NAME:
$format = null;
break;
$command->ins('sort')->add('| sort');
return;
case SortableIterator::SORT_BY_TYPE:
$format = '%y';
break;
@ -306,6 +306,6 @@ class GnuFindAdapter extends AbstractAdapter
$command->get('find')->add('-printf')->arg($format.' %h/%f\\n');
$command->ins('sort')->add('| sort');
$command->ins('awk')->add('| awk')->arg('{ print $'.(null === $format ? '1' : '2').' }');
$command->ins('awk')->add('| cut')->arg('-d ')->arg('-f2-');
}
}