Skip to content

Commit fd85ca4

Browse files
author
José Valim
committed
Merge pull request #2652 from chyndman/elixir-bat-iex-startcli
Suppress "-s elixir start_cli" for IEx
2 parents e04a7ae + 187e867 commit fd85ca4

File tree

1 file changed

+9
-2
lines changed

1 file changed

+9
-2
lines changed

bin/elixir.bat

Lines changed: 9 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -48,6 +48,9 @@ set beforeExtra=
4848
rem Flag which determines whether or not to use werl vs erl
4949
set useWerl=0
5050

51+
rem Designates which mode / Elixir component to run as
52+
set runMode="elixir"
53+
5154
rem Recursive loop called for each parameter that parses the cmd line parameters
5255
:startloop
5356
set par="%1"
@@ -62,6 +65,7 @@ if "%par%"=="""" (
6265
)
6366
rem ******* EXECUTION OPTIONS **********************
6467
IF "%par%"==""--werl"" (Set useWerl=1)
68+
IF "%par%"==""+iex"" (Set runMode="iex")
6569
rem ******* elixir parameters **********************
6670
rem Note: we don't have to do anything with options that don't take an argument
6771
IF """"=="%par:-e=%" (shift)
@@ -90,10 +94,13 @@ for /d %%d in ("%originPath%..\lib\*.") do (
9094
)
9195
SETLOCAL disabledelayedexpansion
9296
:run
97+
IF NOT %runMode% == "iex" (
98+
set beforeExtra=-s elixir start_cli %beforeExtra%
99+
)
93100
IF %useWerl% EQU 1 (
94-
start werl.exe %ext_libs% %ELIXIR_ERL_OPTIONS% %parsErlang% -s elixir start_cli %beforeExtra% -extra %*
101+
start werl.exe %ext_libs% %ELIXIR_ERL_OPTIONS% %parsErlang% %beforeExtra% -extra %*
95102
) ELSE (
96-
erl.exe %ext_libs% -noshell %ELIXIR_ERL_OPTIONS% %parsErlang% -s elixir start_cli %beforeExtra% -extra %*
103+
erl.exe %ext_libs% -noshell %ELIXIR_ERL_OPTIONS% %parsErlang% %beforeExtra% -extra %*
97104
)
98105
:end
99106
endlocal

0 commit comments

Comments
 (0)