Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

escaping the windows file.seperator for the regex (fix for #14) #17

Merged
merged 1 commit into from Jun 7, 2014
Merged

escaping the windows file.seperator for the regex (fix for #14) #17

merged 1 commit into from Jun 7, 2014

Conversation

neomaclin
Copy link

Tested with the test case provided(on Windows 7).

@neomaclin neomaclin changed the title escaping the windows file.seperator for the regex escaping the windows file.seperator for the regex (fix for #14) Jun 6, 2014
@huntc
Copy link

huntc commented Jun 6, 2014

Hi @neomaclin,

Thank you for your contribution. Would you mind signing our CLA?

http://www.typesafe.com/contribute/cla

Thanks!

@huntc
Copy link

huntc commented Jun 6, 2014

Thanks for this. Could I also get you to squash your commits?

fix windows file.separator escaping in regex
@neomaclin
Copy link
Author

Hi Chris. No problem, Done and Done

huntc added a commit that referenced this pull request Jun 7, 2014
escaping the windows file.seperator for the regex (fix for #14)
@huntc huntc merged commit f285349 into sbt:master Jun 7, 2014
@huntc
Copy link

huntc commented Jun 7, 2014

Thanks!

@DGolubets
Copy link

Hi! This fix is not correct.
File separator in Windows is backslash. Thus generated regex fails to match paths from main.js cos they are defined in URL format with slashes.
It should be

private def withEscapedSep(p: String): String = withSep(p).replace("\\","/")

P.S. This may not be enough, I see generated paths like "lib\bootstrap/js/bootstrap" in app.build.js which looks wrong..

@huntc
Copy link

huntc commented Jun 22, 2014

The important thing here is that we correctly distinguish between a file path and a uri path and treat the sep properly. It seems to me that we may have them confused in places.

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.

None yet

3 participants