Skip to content

Commit b830485

Browse files
author
José Valim
committed
Ensure Elixir can run on directories with :, closes #1375
1 parent 15d347f commit b830485

File tree

3 files changed

+5
-15
lines changed

3 files changed

+5
-15
lines changed

Makefile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
REBAR := $(shell echo `pwd`/rebar)
1+
REBAR := "$(shell echo `pwd`/rebar)"
22
ELIXIRC := bin/elixirc --ignore-module-conflict $(ELIXIRC_OPTS)
33
ERLC := erlc -I lib/elixir/include
44
ERL := erl -I lib/elixir/include -noshell -pa lib/elixir/ebin

bin/elixir

Lines changed: 2 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -74,21 +74,12 @@ done
7474
SELF=$(readlink_f "$0")
7575
SCRIPT_PATH=$(dirname "$SELF")
7676

77-
if [ "$ERL_LIBS" = "" ]
78-
then
79-
ERL_LIBS="$SCRIPT_PATH/../lib"
80-
else
81-
PATHSEP=":"
82-
if [ "$OSTYPE" = "msys" ]; then PATHSEP=";" ; fi
83-
ERL_LIBS="$ERL_LIBS$PATHSEP$SCRIPT_PATH/../lib"
84-
fi
85-
8677
if [ -f "$HOME/.elixirrc" ]; then . "$HOME/.elixirrc"; fi
8778
if [ "$ELIXIR_NO_CLI" != "1" ]; then ERL="$ERL -s elixir start_cli"; fi
8879

8980
if [ -f "$SCRIPT_PATH/../releases/RELEASES" ] && [ -f "$SCRIPT_PATH/erl" ]
9081
then
91-
exec "$SCRIPT_PATH"/erl -env ERL_LIBS "$ERL_LIBS" -boot elixir -noshell $ELIXIR_ERL_OPTS $ERL -extra "$@"
82+
exec "$SCRIPT_PATH"/erl -pa "$SCRIPT_PATH"/../lib/*/ebin -boot elixir -noshell $ELIXIR_ERL_OPTS $ERL -extra "$@"
9283
else
93-
exec erl -env ERL_LIBS "$ERL_LIBS" -noshell $ELIXIR_ERL_OPTS $ERL -extra "$@"
84+
exec erl -pa "$SCRIPT_PATH"/../lib/*/ebin -noshell $ELIXIR_ERL_OPTS $ERL -extra "$@"
9485
fi

lib/elixir/test/elixir/test_helper.exs

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -18,15 +18,15 @@ defmodule PathHelpers do
1818
end
1919

2020
def elixir(args) do
21-
runcmd(elixir_executable,args)
21+
runcmd(elixir_executable, args)
2222
end
2323

2424
def elixir_executable do
2525
executable_path("elixir")
2626
end
2727

2828
def elixirc(args) do
29-
runcmd(elixirc_executable,args)
29+
runcmd(elixirc_executable, args)
3030
end
3131

3232
def elixirc_executable do
@@ -48,7 +48,6 @@ defmodule PathHelpers do
4848
def executable_extension, do: ""
4949
def redirect_std_err_on_win, do: ""
5050
end
51-
5251
end
5352

5453
defmodule CompileAssertion do

0 commit comments

Comments
 (0)