diff options
| author | simonxu72 <simon.xu72@gmail.com> | 2018-11-13 13:19:13 +0800 |
|---|---|---|
| committer | simonxu72 <simon.xu72@gmail.com> | 2018-11-13 13:19:13 +0800 |
| commit | 4014faf695c3da3a8f0c7aa088cdae0725433d16 (patch) | |
| tree | 9601583c4314fd1fdca3c12d657ac54b286f9d21 /src/rebar_utils.erl | |
| parent | 41d133856bf199034b0eeb0903bedc2071fba7e1 (diff) | |
| parent | d0e9a553468424b53aeb9907201d0b4f5aa4fad2 (diff) | |
merge from upstream/master
Diffstat (limited to 'src/rebar_utils.erl')
| -rw-r--r-- | src/rebar_utils.erl | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/rebar_utils.erl b/src/rebar_utils.erl index 1769b79..11add61 100644 --- a/src/rebar_utils.erl +++ b/src/rebar_utils.erl @@ -156,7 +156,7 @@ sh_send(Command0, String, Options0) -> Options = [expand_sh_flag(V) || V <- proplists:compact(Options0 ++ DefaultOptions)], - Command = lists:flatten(patch_on_windows(Command0, proplists:get_value(env, Options, []))), + Command = lists:flatten(patch_on_windows(Command0, proplists:get_value(env, Options0, []))), PortSettings = proplists:get_all_values(port_settings, Options) ++ [exit_status, {line, 16384}, use_stdio, stderr_to_stdout, hide], Port = open_port({spawn, Command}, PortSettings), @@ -187,7 +187,7 @@ sh(Command0, Options0) -> ErrorHandler = proplists:get_value(error_handler, Options), OutputHandler = proplists:get_value(output_handler, Options), - Command = lists:flatten(patch_on_windows(Command0, proplists:get_value(env, Options, []))), + Command = lists:flatten(patch_on_windows(Command0, proplists:get_value(env, Options0, []))), PortSettings = proplists:get_all_values(port_settings, Options) ++ [exit_status, {line, 16384}, use_stdio, stderr_to_stdout, hide, eof], ?DEBUG("Port Cmd: ~ts\nPort Opts: ~p\n", [Command, PortSettings]), |