kenmirrors/MagicMirror
1
0
Fork 0
mirror of https://github.com/MichMich/MagicMirror.git synced 2025-09-14 16:13:57 +00:00
Code Issues Projects Releases Wiki Activity

refactor: use global.root_path instead relative paths (#3883)

Browse Source
This commit is contained in:
Karsten Hassel
2025-09-09 08:09:45 +02:00
committed by GitHub
parent 31bafc3297
commit b1865d8115
16 changed files with 34 additions and 35 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
modules/default/calendar/calendarfetcherutils.js
View File

@@ -3,7 +3,7 @@
*/
const moment = require("moment-timezone");
const Log = require("../../../js/logger");
const Log = require("logger");
const CalendarFetcherUtils = {

2
modules/default/calendar/debug.js
View File

@@ -5,7 +5,7 @@
*/
// Alias modules mentioned in package.js under _moduleAliases.
require("module-alias/register");
const Log = require("../../../js/logger");
const Log = require("logger");
const CalendarFetcher = require("./calendarfetcher");

6
modules/default/updatenotification/git_helper.js
View File

@@ -4,8 +4,6 @@ const fs = require("node:fs");
const path = require("node:path");
const Log = require("logger");
const BASE_DIR = path.normalize(`${__dirname}/../../../`);
class GitHelper {
constructor () {
this.gitRepos = [];
@@ -35,10 +33,10 @@ class GitHelper {
}
async add (moduleName) {
let moduleFolder = BASE_DIR;
let moduleFolder = `${global.root_path}`;
if (moduleName !== "MagicMirror") {
moduleFolder = `${moduleFolder}modules/${moduleName}`;
moduleFolder = `${moduleFolder}/modules/${moduleName}`;
}
try {

5
modules/default/updatenotification/node_helper.js
View File

@@ -1,7 +1,8 @@
const fs = require("node:fs");
const path = require("node:path");
const NodeHelper = require("node_helper");
const defaultModules = require("../defaultmodules");
const defaultModules = require(`${global.root_path}/modules/default/defaultmodules`);
const GitHelper = require("./git_helper");
const UpdateHelper = require("./update_helper");
@@ -21,7 +22,7 @@ module.exports = NodeHelper.create({
return modules;
} else {
// get modules from modules-directory
const moduleDir = path.normalize(`${__dirname}/../../`);
const moduleDir = path.normalize(`${global.root_path}/modules`);
const getDirectories = (source) => {
return fs.readdirSync(source, { withFileTypes: true })
.filter((dirent) => dirent.isDirectory() && dirent.name !== "default")