Fix the rebar wrapper on windows #1295
Merged
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| @@ -150,8 +150,8 @@ defmodule Mix.Rebar do | |||
|
|
|||
| defp wrap_cmd(nil), do: nil | |||
| defp wrap_cmd(rebar) do | |||
| case :os.type do | |||
| { :win32, _ } -> "escript.exe #{rebar}" | |||
| case [:os.type,String.ends_with?(rebar,".cmd")] do | |||
There was a problem hiding this comment.
What do you think of:
if match?({ :win32, _ }, :os.type) and not String.ends_with?(rebar,".cmd") do
"escript.exe #{rebar}"
else
rebar
end
System.find_executable for rebar returns a rebar.cmd file, which should not be wrapped by escript. We now have an extra check that verifies whether the invoked file is indeed a cmd file.
josevalim
pushed a commit
that referenced
this pull request
Jun 20, 2013
Fix the rebar wrapper on windows
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
System.find_executable for rebar returns a rebar.cmd file, which should not
be wrapped by escript. We now have an extra check that verifies whether the
invoked file is indeed a cmd file.