Skip to content

Add -l and -s support to grep.#116

Merged
arturadib merged 2 commits intoshelljs:masterfrom
idearat:master
Jun 15, 2014
Merged

Add -l and -s support to grep.#116
arturadib merged 2 commits intoshelljs:masterfrom
idearat:master

Conversation

@idearat
Copy link
Copy Markdown
Contributor

@idearat idearat commented Apr 18, 2014

No description provided.

@arturadib
Copy link
Copy Markdown
Collaborator

thanks Scott!

for some reason the ordering is coming out different from the expected for Node v0.8 (https://travis-ci.org/arturadib/shelljs/jobs/23311967) so the build is failing.. it's potentially a bug in our grep implementation - it should match whatever Unix's grep does, and I assume it sorts the files before matching? if so we should probably do the same, that way your tests will pass in v0.8 too :)

@idearat
Copy link
Copy Markdown
Contributor Author

idearat commented Apr 21, 2014

Ah, yeah. Didn't consider ordering differences when I was testing locally. I can take a look later tonight at beefing that up so it's robust across versions.

@arturadib
Copy link
Copy Markdown
Collaborator

hmm not sure why it didn't pass Travis this time, I'll merge it in and see what comes out of the build :)

arturadib added a commit that referenced this pull request Jun 15, 2014
Add -l and -s support to grep.
@arturadib arturadib merged commit 65b658d into shelljs:master Jun 15, 2014
arturadib pushed a commit that referenced this pull request Jun 15, 2014
This reverts commit 65b658d, reversing
changes made to e88679a.
@arturadib
Copy link
Copy Markdown
Collaborator

had to revert the merge, it didn't pass Travis again :( can you reproduce the issue? I wasn't able to locally.. seems to have something to do with the resources/ dir..

@idearat
Copy link
Copy Markdown
Contributor Author

idearat commented Jun 29, 2014

Sorry I haven't gotten back to this. Will try to take another look when I get a moment.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants