changed
README.md
|
|
@@ -79,7 +79,7 @@ Add the plugin to your ``rebar.config`` (stable):
|
|
79
79
|
|
|
80
80
|
```erlang
|
|
81
81
|
{plugins, [
|
|
82
|
- {rebar3_lfe, "0.4.7"}
|
|
82
|
+ {rebar3_lfe, "0.4.8"}
|
|
83
83
|
]}.
|
|
84
84
|
```
|
|
85
85
|
|
|
|
@@ -104,7 +104,7 @@ Detailed usage is provided in the [project documentation](https://lfe-rebar3.git
|
|
104
104
|
[gh-actions-badge]: https://github.com/lfe-rebar3/rebar3_lfe/workflows/ci%2Fcd/badge.svg
|
|
105
105
|
[gh-actions]: https://github.com/lfe-rebar3/rebar3_lfe/actions
|
|
106
106
|
[lfe]: https://github.com/lfe/lfe
|
|
107
|
- [lfe badge]: https://img.shields.io/badge/lfe-2.1.0-blue.svg
|
|
107
|
+ [lfe badge]: https://img.shields.io/badge/lfe-2.1.2-blue.svg
|
|
108
108
|
[erlang badge]: https://img.shields.io/badge/erlang-19%E2%88%9225-blue.svg
|
|
109
109
|
[versions]: https://github.com/lfe-rebar3/rebar3_lfe/blob/master/.github/workflows/cicd.yml
|
|
110
110
|
[github tag]: https://github.com/lfe-rebar3/rebar3_lfe/tags
|
changed
hex_metadata.config
|
|
@@ -54,4 +54,4 @@
|
|
54
54
|
[{<<"app">>,<<"ltest">>},
|
|
55
55
|
{<<"optional">>,false},
|
|
56
56
|
{<<"requirement">>,<<"0.13.5">>}]}]}.
|
|
57
|
- {<<"version">>,<<"0.4.7">>}.
|
|
57
|
+ {<<"version">>,<<"0.4.8">>}.
|
changed
priv/templates/rebar.config.escript.tpl
|
|
@@ -6,7 +6,7 @@
|
|
6
6
|
]}.
|
|
7
7
|
|
|
8
8
|
{plugins, [
|
|
9
|
- {rebar3_lfe, "0.4.7"}
|
|
9
|
+ {rebar3_lfe, "0.4.8"}
|
|
10
10
|
]}.
|
|
11
11
|
|
|
12
12
|
{provider_hooks, [
|
changed
priv/templates/rebar.config.main.tpl
|
|
@@ -6,7 +6,7 @@
|
|
6
6
|
]}.
|
|
7
7
|
|
|
8
8
|
{plugins, [
|
|
9
|
- {rebar3_lfe, "0.4.7"}
|
|
9
|
+ {rebar3_lfe, "0.4.8"}
|
|
10
10
|
]}.
|
|
11
11
|
|
|
12
12
|
{lfe, [
|
changed
priv/templates/rebar.config.release.tpl
|
|
@@ -6,7 +6,7 @@
|
|
6
6
|
]}.
|
|
7
7
|
|
|
8
8
|
{plugins, [
|
|
9
|
- {rebar3_lfe, "0.4.7"}
|
|
9
|
+ {rebar3_lfe, "0.4.8"}
|
|
10
10
|
]}.
|
|
11
11
|
|
|
12
12
|
{provider_hooks, [
|
changed
priv/templates/rebar.config.tpl
|
|
@@ -5,6 +5,10 @@
|
|
5
5
|
{ltest, "0.13.5"}
|
|
6
6
|
]}.
|
|
7
7
|
|
|
8
|
+ {plugins, [
|
|
9
|
+ {rebar3_lfe, "0.4.8"}
|
|
10
|
+ ]}.
|
|
11
|
+
|
|
8
12
|
{provider_hooks, [
|
|
9
13
|
{pre, [{compile, {lfe, compile}}]}
|
|
10
14
|
]}.
|
changed
src/rebar3_lfe.app.src
|
|
@@ -1,6 +1,6 @@
|
|
1
1
|
{application,rebar3_lfe,
|
|
2
2
|
[{description,"A comprehensive LFE rebar3 plugin for all your LFE tooling needs"},
|
|
3
|
- {vsn,"0.4.7"},
|
|
3
|
+ {vsn,"0.4.8"},
|
|
4
4
|
{registered,[]},
|
|
5
5
|
{applications,[kernel,stdlib,lfe]},
|
|
6
6
|
{env,[]},
|
changed
src/rebar3_lfe_prv_repl.erl
|
|
@@ -100,7 +100,7 @@ repl(State) ->
|
|
100
100
|
OTPRelease = erlang:system_info(otp_release),
|
|
101
101
|
if OTPRelease >= "26" ->
|
|
102
102
|
rebar_api:debug("\t\tRunning newer Erlang ...", []),
|
|
103
|
- ShellArgs = [{shell_args, #{initial_shell => {rebar3_lfe_repl,start,[ReplCfg]}}}],
|
|
103
|
+ ShellArgs = [{shell_args, [{rebar3_lfe_repl,start,[ReplCfg]}]}],
|
|
104
104
|
State1 = rebar_state:set(State, shell, ShellArgs),
|
|
105
105
|
shell(State1),
|
|
106
106
|
State1;
|
|
|
@@ -135,7 +135,7 @@ shell(State) ->
|
|
135
135
|
setup_name(State),
|
|
136
136
|
setup_paths(State),
|
|
137
137
|
ShellArgs = debug_get_value(shell_args, rebar_state:get(State, shell, []), undefined,
|
|
138
|
- "Found user_drv args from command line option."),
|
|
138
|
+ "Found shell args from command line option or plugin."),
|
|
139
139
|
setup_shell(ShellArgs),
|
|
140
140
|
maybe_run_script(State),
|
|
141
141
|
%% apps must be started after the change in shell because otherwise
|
|
|
@@ -153,7 +153,6 @@ shell(State) ->
|
|
153
153
|
gen_server:enter_loop(rebar_agent, [], GenState, {local, rebar_agent}, hibernate).
|
|
154
154
|
|
|
155
155
|
setup_shell(ShellArgs) ->
|
|
156
|
- user_drv:start(#{initial_shell => noshell}),
|
|
157
156
|
code:ensure_loaded(shell),
|
|
158
157
|
case erlang:function_exported(shell, start_interactive, 0) of
|
|
159
158
|
false ->
|
|
|
@@ -163,6 +162,7 @@ setup_shell(ShellArgs) ->
|
|
163
162
|
NewUser = try erlang:open_port({spawn,"tty_sl -c -e"}, []) of
|
|
164
163
|
Port when is_port(Port) ->
|
|
165
164
|
true = port_close(Port),
|
|
165
|
+ rebar_api:debug("*** Getting ready to setup new shell ...", []),
|
|
166
166
|
setup_new_shell(ShellArgs)
|
|
167
167
|
catch
|
|
168
168
|
error:X ->
|
|
|
@@ -178,7 +178,8 @@ setup_shell(ShellArgs) ->
|
|
178
178
|
end.
|
|
179
179
|
|
|
180
180
|
start_interactive(ShellArgs) ->
|
|
181
|
- user_drv:start_shell(ShellArgs).
|
|
181
|
+ rebar_api:debug("*** Starting the shell w/Erlang apply ...", []),
|
|
182
|
+ apply(shell, start_interactive, ShellArgs).
|
|
182
183
|
|
|
183
184
|
maybe_remove_logger() ->
|
|
184
185
|
case erlang:function_exported(logger, module_info, 0) of
|