Do not reuse shell variables in IEx, closes #2149

Author: José Valim

bin/elixir

@@ -35,14 +35,21 @@ readlink_f () {
   fi
 }
 
+MODE="elixir"
 ERL=""
 I=1
 
 while [ $I -le $# ]; do
   S=1
   eval "PEEK=\${$I}"
   case "$PEEK" in
-    -v|--compile|--no-halt|+iex|+compile)
+    +iex)
+        MODE="iex"
+        ;;
+    +elixirc)
+        MODE="elixirc"
+        ;;
+    -v|--compile|--no-halt)
         ;;
     -e|-r|-pr|-pa|-pz|--remsh|--app)
         S=2
@@ -77,7 +84,7 @@ done
 
 SELF=$(readlink_f "$0")
 SCRIPT_PATH=$(dirname "$SELF")
-if [ "$ELIXIR_NO_CLI" != "1" ]; then ERL="$ERL -s elixir start_cli"; fi
+if [ "$MODE" != "iex" ]; then ERL="$ERL -s elixir start_cli"; fi
 
 if [ -z "$ERL_PATH" ]; then
   if [ -f "$SCRIPT_PATH/../releases/RELEASES" ] && [ -f "$SCRIPT_PATH/erl" ]; then

bin/elixirc

@@ -26,4 +26,4 @@ readlink_f () {
 
 SELF=$(readlink_f "$0")
 SCRIPT_PATH=$(dirname "$SELF")
-exec "$SCRIPT_PATH"/elixir +compile "$@"
+exec "$SCRIPT_PATH"/elixir +elixirc "$@"

bin/elixirc.bat

@@ -20,4 +20,4 @@ echo ** Options marked with (*) can be given more than once
 echo ** Options given after -- are passed down to the executed code
 echo ** Options can be passed to the erlang runtime using ELIXIR_ERL_OPTS" >&2
 :run
-call "%~dp0\elixir.bat" +compile %*
+call "%~dp0\elixir.bat" +elixirc %*

bin/iex

@@ -39,4 +39,4 @@ readlink_f () {
 
 SELF=$(readlink_f "$0")
 SCRIPT_PATH=$(dirname "$SELF")
-ELIXIR_NO_CLI=1 exec "$SCRIPT_PATH"/elixir --no-halt --erl "-user Elixir.IEx.CLI" +iex "$@"
+exec "$SCRIPT_PATH"/elixir --no-halt --erl "-user Elixir.IEx.CLI" +iex "$@"

lib/elixir/lib/kernel/cli.ex

@@ -171,7 +171,7 @@ defmodule Kernel.CLI do
     { config, t }
   end
 
-  defp process_argv(["+compile"|t], config) do
+  defp process_argv(["+elixirc"|t], config) do
     process_compiler t, config
   end