Merge pull request #2651 from EvenMoreIrrelevance/dev

Fix #2650
BetterThanTomorrow · Oct 17, 2024 · de2b759 · de2b759
2 parents a095df0 + 8f446db
commit de2b759
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 1 deletion.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -3,6 +3,7 @@
 Changes to Calva.
 
 ## [Unreleased]
+- Fix: [Only the first environment variable is resolved in jackInEnvironment](https://github.com/BetterThanTomorrow/calva/issues/2650)
 
 - Fix: [ns inner blocks are kept on the same line by default when using the clean ns command](https://github.com/BetterThanTomorrow/calva/issues/2648)
 

diff --git a/src/nrepl/jack-in.ts b/src/nrepl/jack-in.ts
@@ -28,7 +28,7 @@ import * as inspector from '../providers/inspector';
 
 function resolveEnvVariables(entry: any): any {
   if (typeof entry === 'string') {
-    const s = entry.replace(/\$\{env:(\w+)\}/, (_, v) => (process.env[v] ? process.env[v] : ''));
+    const s = entry.replace(/\$\{env:(\w+)\}/g, (_, v) => (process.env[v] ? process.env[v] : ''));
     return s;
   } else {
     return entry;