Skip to content

Commit bacec6d

Browse files
committed
Disable delayed expansion when reading vars
1 parent f87d6c0 commit bacec6d

File tree

1 file changed

+12
-11
lines changed

1 file changed

+12
-11
lines changed

bin/elixir.bat

Lines changed: 12 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -90,14 +90,15 @@ set ERTS_BIN=!ERTS_BIN!
9090

9191
rem Recursive loop called for each parameter that parses the cmd line parameters
9292
:startloop
93+
setlocal disabledelayedexpansion
9394
set "par=%~1"
95+
endlocal & set "par=%par%"
9496
if "!par!"=="" (
9597
rem skip if no parameter
9698
goto run
9799
)
98100
shift
99-
set "par=!par:"=\"!"
100-
set "par=!par:^|=\^|!"
101+
set par="!par:"=\"!"
101102
if !endLoop! == 1 (
102103
set parsElixir=!parsElixir! !par!
103104
goto startloop
@@ -108,29 +109,29 @@ if !par!=="+iex" (set parsElixir=!parsElixir! +iex && set useIEx=1 && goto s
108109
if !par!=="+elixirc" (set parsElixir=!parsElixir! +elixirc && goto startloop)
109110
rem ******* EVAL PARAMETERS ************************
110111
if ""==!par:-e=! (
112+
setlocal disabledelayedexpansion
111113
set "VAR=%~1"
114+
endlocal & set "VAR=%VAR%"
112115
if not defined VAR (set VAR= )
113-
set "VAR=!VAR:"=\"!"
114-
set "VAR=!VAR:^|=\^|!"
115-
set parsElixir=!parsElixir! -e "!VAR"
116+
set parsElixir=!parsElixir! -e "!VAR:"=\"!"
116117
shift
117118
goto startloop
118119
)
119120
if ""==!par:--eval=! (
121+
setlocal disabledelayedexpansion
120122
set "VAR=%~1"
123+
endlocal & set "VAR=%VAR%"
121124
if not defined VAR (set VAR= )
122-
set "VAR=!VAR:"=\"!"
123-
set "VAR=!VAR:^|=\^|!"
124-
set parsElixir=!parsElixir! --eval "!VAR"
125+
set parsElixir=!parsElixir! --eval "!VAR:"=\"!"
125126
shift
126127
goto startloop
127128
)
128129
if ""==!par:--rpc-eval=! (
130+
setlocal disabledelayedexpansion
129131
set "VAR=%~2"
132+
endlocal & set "VAR=%VAR%"
130133
if not defined VAR (set VAR= )
131-
set "VAR=!VAR:"=\"!"
132-
set "VAR=!VAR:^|=\^|!"
133-
set parsElixir=!parsElixir! --rpc-eval %1 "!VAR"
134+
set parsElixir=!parsElixir! --rpc-eval %1 "!VAR:"=\"!"
134135
shift
135136
shift
136137
goto startloop

0 commit comments

Comments
 (0)