summaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
authorDavid Lönnhager <david.l@mullvad.net>2024-12-09 08:05:01 +0100
committerDavid Lönnhager <david.l@mullvad.net>2024-12-10 14:34:21 +0100
commitfd5a95076d6b953cf22fdf8a0067d0759b3e1658 (patch)
treee525ae97cf7202518ec7636ebc550f175a081795
parenteb20403434156f6924628f34da908d794345c6cc (diff)
downloadmullvadvpn-fd5a95076d6b953cf22fdf8a0067d0759b3e1658.tar.xz
mullvadvpn-fd5a95076d6b953cf22fdf8a0067d0759b3e1658.zip
Match env vars on same line correctly
-rw-r--r--desktop/packages/mullvad-vpn/tasks/distribution.js9
1 files changed, 6 insertions, 3 deletions
diff --git a/desktop/packages/mullvad-vpn/tasks/distribution.js b/desktop/packages/mullvad-vpn/tasks/distribution.js
index 709a8d85b7..6401e24a45 100644
--- a/desktop/packages/mullvad-vpn/tasks/distribution.js
+++ b/desktop/packages/mullvad-vpn/tasks/distribution.js
@@ -68,9 +68,12 @@ const config = {
if (context.arch !== Arch.universal) {
const resources = context.packager.platformSpecificBuildOptions.extraResources;
for (const resource of resources) {
- const filePath = resource.from.replace(/\$\{env\.(.*)\}/, function (match, captureGroup) {
- return process.env[captureGroup];
- });
+ const filePath = resource.from.replaceAll(
+ /\$\{env\.(.*?)\}/g,
+ function (match, captureGroup) {
+ return process.env[captureGroup];
+ },
+ );
if (!fs.existsSync(filePath)) {
throw new Error(`Can't find file: ${filePath}`);