Skip to content

Commit

Permalink
Merge pull request #4 from platinumthinker/master
Browse files Browse the repository at this point in the history
Support rebar3
  • Loading branch information
proger authored Apr 11, 2017
2 parents 3dc8e7a + fc2d82d commit 4e8a107
Show file tree
Hide file tree
Showing 3 changed files with 18 additions and 1 deletion.
4 changes: 4 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -1,3 +1,7 @@
/_build
/doc
/priv/fdlink
.rebar3
c_src/fdlink.d
c_src/fdlink.o
ebin
13 changes: 13 additions & 0 deletions rebar.config
Original file line number Diff line number Diff line change
@@ -1,3 +1,16 @@
{port_specs, [
{"priv/fdlink", ["c_src/fdlink.c"]}
]}.

{plugins, [pc]}.

{provider_hooks,
[
{pre,
[
{compile, {pc, compile}},
{clean, {pc, clean}}
]
}
]
}.
2 changes: 1 addition & 1 deletion src/erlsh.erl
Original file line number Diff line number Diff line change
Expand Up @@ -78,5 +78,5 @@ sh_loop(Port, Fun, Acc, Flatten) when is_function(Fun) ->
%t() -> dbg:tracer(), dbg:p(self(), m), dbg:p(new, m), run("false", "/tmp/1", "/tmp").

ts() ->
Ts = {{_Y,_M,_D},{_H,_Min,_S}} = calendar:now_to_datetime(now()),
Ts = {{_Y,_M,_D},{_H,_Min,_S}} = calendar:now_to_datetime(os:timestamp()),
io_lib:format("~p", [Ts]).

0 comments on commit 4e8a107

Please sign in to comment.