From 3a3684ca786b05188e63e403bbd2bdd8b4735ba2 Mon Sep 17 00:00:00 2001 From: Chris Hyndman Date: Tue, 1 Jul 2014 13:44:23 -0700 Subject: [PATCH 1/2] Process Erlang commands last --- bin/elixir.bat | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/bin/elixir.bat b/bin/elixir.bat index 3ed6dda115..7bafa78dbe 100644 --- a/bin/elixir.bat +++ b/bin/elixir.bat @@ -60,13 +60,6 @@ if "%par%"=="""" ( ) rem ******* EXECUTION OPTIONS ********************** IF "%par%"==""+iex"" (Set useWerl=1) -rem ******* ERLANG PARAMETERS ********************** -IF NOT "%par%"=="%par:--detached=%" (Set parsErlang=%parsErlang% -detached) -IF NOT "%par%"=="%par:--hidden=%" (Set parsErlang=%parsErlang% -hidden) -IF NOT "%par%"=="%par:--cookie=%" (Set parsErlang=%parsErlang% -setcookie %1 && shift) -IF NOT "%par%"=="%par:--sname=%" (Set parsErlang=%parsErlang% -sname %1 && shift) -IF NOT "%par%"=="%par:--name=%" (Set parsErlang=%parsErlang% -name %1 && shift) -IF NOT "%par%"=="%par:--erl=%" (Set beforeExtra=%beforeExtra% %~1 && shift) rem ******* elixir parameters ********************** rem Note: we don't have to do anything with options that don't take an argument IF NOT "%par%"=="%par:-e=%" (shift) @@ -76,6 +69,13 @@ IF NOT "%par%"=="%par:-pa=%" (shift) IF NOT "%par%"=="%par:-pz=%" (shift) IF NOT "%par%"=="%par:--app=%" (shift) IF NOT "%par%"=="%par:--remsh=%" (shift) +rem ******* ERLANG PARAMETERS ********************** +IF NOT "%par%"=="%par:--detached=%" (Set parsErlang=%parsErlang% -detached) +IF NOT "%par%"=="%par:--hidden=%" (Set parsErlang=%parsErlang% -hidden) +IF NOT "%par%"=="%par:--cookie=%" (Set parsErlang=%parsErlang% -setcookie %1 && shift) +IF NOT "%par%"=="%par:--sname=%" (Set parsErlang=%parsErlang% -sname %1 && shift) +IF NOT "%par%"=="%par:--name=%" (Set parsErlang=%parsErlang% -name %1 && shift) +IF NOT "%par%"=="%par:--erl=%" (Set beforeExtra=%beforeExtra% %~1 && shift) goto:startloop rem ******* assume all pre-params are parsed ******************** From 0c589eff046050be2203e14fa20a7861531abcc9 Mon Sep 17 00:00:00 2001 From: Chris Hyndman Date: Tue, 1 Jul 2014 13:51:25 -0700 Subject: [PATCH 2/2] Umanbiguous check for parameters --- bin/elixir.bat | 26 +++++++++++++------------- 1 file changed, 13 insertions(+), 13 deletions(-) diff --git a/bin/elixir.bat b/bin/elixir.bat index 7bafa78dbe..30f5ceedf1 100644 --- a/bin/elixir.bat +++ b/bin/elixir.bat @@ -62,20 +62,20 @@ rem ******* EXECUTION OPTIONS ********************** IF "%par%"==""+iex"" (Set useWerl=1) rem ******* elixir parameters ********************** rem Note: we don't have to do anything with options that don't take an argument -IF NOT "%par%"=="%par:-e=%" (shift) -IF NOT "%par%"=="%par:-r=%" (shift) -IF NOT "%par%"=="%par:-pr=%" (shift) -IF NOT "%par%"=="%par:-pa=%" (shift) -IF NOT "%par%"=="%par:-pz=%" (shift) -IF NOT "%par%"=="%par:--app=%" (shift) -IF NOT "%par%"=="%par:--remsh=%" (shift) +IF """"=="%par:-e=%" (shift) +IF """"=="%par:-r=%" (shift) +IF """"=="%par:-pr=%" (shift) +IF """"=="%par:-pa=%" (shift) +IF """"=="%par:-pz=%" (shift) +IF """"=="%par:--app=%" (shift) +IF """"=="%par:--remsh=%" (shift) rem ******* ERLANG PARAMETERS ********************** -IF NOT "%par%"=="%par:--detached=%" (Set parsErlang=%parsErlang% -detached) -IF NOT "%par%"=="%par:--hidden=%" (Set parsErlang=%parsErlang% -hidden) -IF NOT "%par%"=="%par:--cookie=%" (Set parsErlang=%parsErlang% -setcookie %1 && shift) -IF NOT "%par%"=="%par:--sname=%" (Set parsErlang=%parsErlang% -sname %1 && shift) -IF NOT "%par%"=="%par:--name=%" (Set parsErlang=%parsErlang% -name %1 && shift) -IF NOT "%par%"=="%par:--erl=%" (Set beforeExtra=%beforeExtra% %~1 && shift) +IF """"=="%par:--detached=%" (Set parsErlang=%parsErlang% -detached) +IF """"=="%par:--hidden=%" (Set parsErlang=%parsErlang% -hidden) +IF """"=="%par:--cookie=%" (Set parsErlang=%parsErlang% -setcookie %1 && shift) +IF """"=="%par:--sname=%" (Set parsErlang=%parsErlang% -sname %1 && shift) +IF """"=="%par:--name=%" (Set parsErlang=%parsErlang% -name %1 && shift) +IF """"=="%par:--erl=%" (Set beforeExtra=%beforeExtra% %~1 && shift) goto:startloop rem ******* assume all pre-params are parsed ********************