diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/rebar_plugins.erl | 3 | ||||
| -rw-r--r-- | src/rebar_prv_clean.erl | 2 | ||||
| -rw-r--r-- | src/rebar_prv_upgrade.erl | 2 | ||||
| -rw-r--r-- | src/rebar_state.erl | 4 | ||||
| -rw-r--r-- | src/rebar_utils.erl | 6 |
5 files changed, 9 insertions, 8 deletions
diff --git a/src/rebar_plugins.erl b/src/rebar_plugins.erl index 3e855de..bda3fb7 100644 --- a/src/rebar_plugins.erl +++ b/src/rebar_plugins.erl @@ -94,7 +94,8 @@ build_plugin(AppInfo, Apps, State) -> Providers = rebar_state:providers(State), Providers1 = rebar_state:providers(rebar_app_info:state(AppInfo)), S = rebar_state:all_deps(rebar_app_info:state_or_new(State, AppInfo), Apps), - rebar_prv_compile:compile(S, Providers++Providers1, AppInfo). + S1 = rebar_state:set(S, deps_dir, ?DEFAULT_PLUGINS_DIR), + rebar_prv_compile:compile(S1, Providers++Providers1, AppInfo). plugin_providers({Plugin, _, _, _}) when is_atom(Plugin) -> validate_plugin(Plugin); diff --git a/src/rebar_prv_clean.erl b/src/rebar_prv_clean.erl index e3cb84e..f10d12b 100644 --- a/src/rebar_prv_clean.erl +++ b/src/rebar_prv_clean.erl @@ -39,7 +39,7 @@ do(State) -> case All of true -> DepsDir = rebar_dir:deps_dir(State), - DepApps = rebar_app_discover:find_apps([DepsDir], all); + DepApps = rebar_app_discover:find_apps([filename:join(DepsDir, "*")], all); false -> DepApps = [] end, diff --git a/src/rebar_prv_upgrade.erl b/src/rebar_prv_upgrade.erl index 46aed9e..a50e64f 100644 --- a/src/rebar_prv_upgrade.erl +++ b/src/rebar_prv_upgrade.erl @@ -45,7 +45,7 @@ init(State) -> do(State) -> {Args, _} = rebar_state:command_parsed_args(State), Locks = rebar_state:get(State, {locks, default}, []), - Deps = rebar_state:get(State, deps), + Deps = rebar_state:get(State, deps, []), Names = parse_names(ec_cnv:to_binary(proplists:get_value(package, Args, <<"">>)), Locks), case prepare_locks(Names, Deps, Locks, []) of {error, Reason} -> diff --git a/src/rebar_state.erl b/src/rebar_state.erl index 1e0abc5..8c43496 100644 --- a/src/rebar_state.erl +++ b/src/rebar_state.erl @@ -344,8 +344,8 @@ merge_opts(Profile, NewOpts, OldOpts) -> end. merge_opts(NewOpts, OldOpts) -> - dict:merge(fun(deps, NewValue, _OldValue) -> - NewValue; + dict:merge(fun(deps, _NewValue, OldValue) -> + OldValue; ({deps, _}, NewValue, _OldValue) -> NewValue; (plugins, NewValue, _OldValue) -> diff --git a/src/rebar_utils.erl b/src/rebar_utils.erl index c729b58..7ae3d9c 100644 --- a/src/rebar_utils.erl +++ b/src/rebar_utils.erl @@ -757,12 +757,12 @@ set_httpc_options(Scheme, Proxy) -> escape_chars(Str) when is_atom(Str) -> escape_chars(atom_to_list(Str)); escape_chars(Str) -> - re:replace(Str, "([ ()?`!$])", "\\\\&", [global, {return, list}]). + re:replace(Str, "([ ()?`!$&;])", "\\\\&", [global, {return, list}]). %% "escape inside these" escape_double_quotes(Str) -> - re:replace(Str, "([\"\\\\`!$*])", "\\\\&", [global, {return, list}]). + re:replace(Str, "([\"\\\\`!$&*;])", "\\\\&", [global, {return, list}]). %% "escape inside these" but allow * escape_double_quotes_weak(Str) -> - re:replace(Str, "([\"\\\\`!$])", "\\\\&", [global, {return, list}]). + re:replace(Str, "([\"\\\\`!$&;])", "\\\\&", [global, {return, list}]). |