Pārlūkot izejas kodu

Merge pull request #102 from pragdave/master

Add one more "unicode" option in expand_env_variable—I have a bullet in my prompt that was blowing it up
pull/3/head
Dave Smith pirms 12 gadiem
vecāks
revīzija
be8b022a82
1 mainītis faili ar 2 papildinājumiem un 2 dzēšanām
  1. +2
    -2
      src/rebar_utils.erl

+ 2
- 2
src/rebar_utils.erl Parādīt failu

@ -191,11 +191,11 @@ expand_env_variable(InStr, VarName, RawVarValue) ->
%% No variables to expand
InStr;
_ ->
VarValue = re:replace(RawVarValue, "\\\\", "\\\\\\\\", [global]),
ReOpts = [global, unicode, {return, list}],
VarValue = re:replace(RawVarValue, "\\\\", "\\\\\\\\", ReOpts),
%% Use a regex to match/replace:
%% Given variable "FOO": match $FOO\s | $FOOeol | ${FOO}
RegEx = io_lib:format("\\\$(~s(\\s|$)|{~s})", [VarName, VarName]),
ReOpts = [global, {return, list}, unicode],
re:replace(InStr, RegEx, [VarValue, "\\2"], ReOpts)
end.

Notiek ielāde…
Atcelt
Saglabāt