Skip to content

Commit 72be039

Browse files
committed
fix module paths, needed to run with MagicMirror² >= v2.29.0
1 parent 1cc2e78 commit 72be039

File tree

1 file changed

+8
-4
lines changed

1 file changed

+8
-4
lines changed

node_helper.js

Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ const bodyParser = require("body-parser");
1919
const express = require("express");
2020
const _ = require("lodash");
2121

22-
var defaultModules = require(path.resolve(__dirname + "/../default/defaultmodules.js"));
22+
var defaultModules = require(path.resolve(__dirname + "/../../modules/default/defaultmodules.js"));
2323

2424
Module = {
2525
configDefaults: {},
@@ -221,7 +221,7 @@ module.exports = NodeHelper.create(Object.assign({
221221
url: "https://docs.magicmirror.builders/modules/introduction.html"
222222
});
223223
var module = self.modulesAvailable[self.modulesAvailable.length - 1];
224-
var modulePath = self.configOnHd.paths.modules + "/default/" + defaultModules[i];
224+
var modulePath = "modules/default/" + defaultModules[i];
225225
self.loadModuleDefaultConfig(module, modulePath, i === defaultModules.length-1);
226226
}
227227

@@ -235,10 +235,14 @@ module.exports = NodeHelper.create(Object.assign({
235235
});
236236
},
237237

238+
getModuleDir() {
239+
return this.configOnHd.foreignModulesDir ? this.configOnHd.foreignModulesDir : (this.configOnHd.paths ? this.configOnHd.paths.modules : "modules");
240+
},
241+
238242
addModule(folderName, lastOne) {
239243
var self = this;
240244

241-
var modulePath = this.configOnHd.paths.modules + "/" + folderName;
245+
var modulePath = this.getModuleDir() + "/" + folderName;
242246
fs.stat(modulePath, (err, stats) => {
243247
if (stats.isDirectory()) {
244248
var isInList = false;
@@ -340,7 +344,7 @@ module.exports = NodeHelper.create(Object.assign({
340344
});
341345
return;
342346
}
343-
var modulePath = this.configOnHd.paths.modules + "/" + query.module;
347+
var modulePath = this.getModuleDir() + "/" + query.module;
344348
let git = simpleGit(modulePath);
345349
git.getRemotes(true, function(error, result) {
346350
if (error) {

0 commit comments

Comments
 (0)