Pass -elixir_root as arg

Author: josevalim

bin/elixir

@@ -223,7 +223,7 @@ fi
 ERTS_BIN=
 ERTS_BIN="$ERTS_BIN"
 
-set -- "$ERTS_BIN$ERL_EXEC" -noshell -env ELIXIR_ROOT "$SCRIPT_PATH"/../lib -pa "$SCRIPT_PATH"/../lib/elixir/ebin $ELIXIR_ERL_OPTIONS -s elixir start_cli $ERL "$@"
+set -- "$ERTS_BIN$ERL_EXEC" -noshell -elixir_root "$SCRIPT_PATH"/../lib -pa "$SCRIPT_PATH"/../lib/elixir/ebin $ELIXIR_ERL_OPTIONS -s elixir start_cli $ERL "$@"
 
 if [ -n "$RUN_ERL_PIPE" ]; then
   ESCAPED=""

lib/elixir/src/elixir.erl

@@ -31,18 +31,18 @@ start(_Type, _Args) ->
   set_stdio_and_stderr_to_binary_and_maybe_utf8(),
   check_file_encoding(file:native_name_encoding()),
 
-  case os:getenv("ELIXIR_ROOT") of
-    false ->
-      ok;
-    Root ->
+  case init:get_argument(elixir_root) of
+    {ok, [[Root]]} ->
       code:add_pathsa([
         Root ++ "/eex/ebin",
         Root ++ "/ex_unit/ebin",
         Root ++ "/iex/ebin",
         Root ++ "/logger/ebin",
         Root ++ "/mix/ebin",
         Root ++ "/elixir/ebin"
-      ])
+      ]);
+    _ ->
+      ok
   end,
 
   case application:get_env(elixir, check_endianness, true) of
@@ -173,9 +173,9 @@ start_cli() ->
   elixir_config:booted().
 
 start() ->
-  case os:getenv("ELIXIR_ROOT") of
-    false -> ok;
-    Root -> code:add_patha(Root ++ "/iex/ebin")
+  case init:get_argument(elixir_root) of
+    {ok, [[Root]]} -> code:add_patha(Root ++ "/iex/ebin");
+    _ -> ok
   end,
   'Elixir.IEx.CLI':main().
 

lib/mix/lib/mix/tasks/release.ex

@@ -1433,7 +1433,7 @@ defmodule Mix.Tasks.Release do
        &(&1
          |> File.read!()
          |> String.replace(
-           ~s[ -env ELIXIR_ROOT "$SCRIPT_PATH"/../lib -pa "$SCRIPT_PATH"/../lib/elixir/ebin ],
+           ~s[ -elixir_root "$SCRIPT_PATH"/../lib -pa "$SCRIPT_PATH"/../lib/elixir/ebin ],
            " "
          )
          |> replace_erts_bin(release, ~s["$SCRIPT_PATH"/../../erts-#{release.erts_version}/bin/]))},
@@ -1447,7 +1447,7 @@ defmodule Mix.Tasks.Release do
        &(&1
          |> File.read!()
          |> String.replace(
-           ~s[ -env ELIXIR_ROOT !SCRIPT_PATH!..\\lib -pa !SCRIPT_PATH!..\\lib\\elixir\\ebin ],
+           ~s[ -elixir_root !SCRIPT_PATH!..\\lib -pa !SCRIPT_PATH!..\\lib\\elixir\\ebin ],
            " "
          )
          |> replace_erts_bin(release, ~s[%~dp0\\..\\..\\erts-#{release.erts_version}\\bin\\]))},