From ed11b1efe80593d99234fe7ff039413e69ef410e Mon Sep 17 00:00:00 2001
From: Karsten Hassel <hassel@gmx.de>
Date: Mon, 25 Dec 2023 20:40:23 +0100
Subject: [PATCH] fix MM_PORT variable not used in electron and allow full path
 for MM_CONFIG_FILE variable

---
 CHANGELOG.md   | 1 +
 js/app.js      | 2 +-
 js/electron.js | 3 ++-
 3 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index e7cdba1882..413ac26bd4 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -49,6 +49,7 @@ _This release is scheduled to be released on 2024-01-01._
 - Fix style issues after prettier update
 - Fix calendar test (#3291) by moving "Exdate check" from e2e to electron to run on a Thursday
 - Fix calendar config params `fetchInterval` and `excludedEvents` were never used from single calendar config (#3297)
+- Fix MM_PORT variable not used in electron and allow full path for MM_CONFIG_FILE variable (#3302)
 
 ## [2.25.0] - 2023-10-01
 
diff --git a/js/app.js b/js/app.js
index 822021dccb..3957ef933d 100644
--- a/js/app.js
+++ b/js/app.js
@@ -25,7 +25,7 @@ Log.log(`Starting MagicMirror: v${global.version}`);
 global.root_path = path.resolve(`${__dirname}/../`);
 
 if (process.env.MM_CONFIG_FILE) {
-	global.configuration_file = process.env.MM_CONFIG_FILE;
+	global.configuration_file = process.env.MM_CONFIG_FILE.replace(`${global.root_path}/`, "");
 }
 
 // FIXME: Hotfix Pull Request
diff --git a/js/electron.js b/js/electron.js
index 073642943f..7eae34c544 100644
--- a/js/electron.js
+++ b/js/electron.js
@@ -79,7 +79,8 @@ function createWindow () {
 	}
 
 	let address = (config.address === void 0) | (config.address === "") | (config.address === "0.0.0.0") ? (config.address = "localhost") : config.address;
-	mainWindow.loadURL(`${prefix}${address}:${config.port}`);
+	const port = process.env.MM_PORT || config.port;
+	mainWindow.loadURL(`${prefix}${address}:${port}`);
 
 	// Open the DevTools if run with "npm start dev"
 	if (process.argv.includes("dev")) {