#467: quickfix for tilde expansion (#468)

scripts/src/main/resources/scripts/environment-project.bat

@@ -84,29 +84,25 @@ set "line=%*"
 if "%~1%" == "export" (
   rem remove export as this only makes sense on linux/mac
   set line=!line:~7!
-  if "%~3%" == "" (
-    set "search=%~2%"
-  ) else (
-    set "search=%~2% "
-  )
-  set "replacement=%~2%="
+  shift
+)
+if "%~2%" == "" (
+  set "search=%~1"
 ) else (
-  if "%~2%" == "" (
-    set "search=%~1%"
-  ) else (
-    set "search=%~1% "
-  )
-  set "replacement=%~1%="
+  set "search=%~1 "
+)
+set "replacement=%~1="
+set value=%~2
+if "!value:~0,1!" == "~" (
+  rem variable value starts with tilde that needs to be replaced with users home dir (USERPROFILE)
+  set line=%replacement%%USERPROFILE%!value:~1!
+) else (
+  set line=!line:%search%=%replacement%!
 )
-set line=!line:%search%=%replacement%!
 rem replace ${var} variable syntax with windows %var% syntax
 set line=!line:${=%%!
 set line=!line:}=%%!
-set line=!line:"=%!
-rem resolve ~ to user home (USERPROFILE)
-if "!value:~0,1!" == "~" (
-  set "value=%USERPROFILE%!value:~1!"
-)
+set line=!line:"=!
 (
   rem endlocal in () block to access local variable and "export" it
   endlocal