fix: improve parsing of --env
flag
#3286
+80
−21
Merged
--env
flag
#3286