@@ -19,7 +19,7 @@ const bodyParser = require("body-parser");
19
19
const express = require ( "express" ) ;
20
20
const _ = require ( "lodash" ) ;
21
21
22
- var defaultModules = require ( path . resolve ( __dirname + "/../default/defaultmodules.js" ) ) ;
22
+ var defaultModules = require ( path . resolve ( __dirname + "/../../modules/ default/defaultmodules.js" ) ) ;
23
23
24
24
Module = {
25
25
configDefaults : { } ,
@@ -221,7 +221,7 @@ module.exports = NodeHelper.create(Object.assign({
221
221
url : "https://docs.magicmirror.builders/modules/introduction.html"
222
222
} ) ;
223
223
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 ] ;
225
225
self . loadModuleDefaultConfig ( module , modulePath , i === defaultModules . length - 1 ) ;
226
226
}
227
227
@@ -235,10 +235,14 @@ module.exports = NodeHelper.create(Object.assign({
235
235
} ) ;
236
236
} ,
237
237
238
+ getModuleDir ( ) {
239
+ return this . configOnHd . foreignModulesDir ? this . configOnHd . foreignModulesDir : ( this . configOnHd . paths ? this . configOnHd . paths . modules : "modules" ) ;
240
+ } ,
241
+
238
242
addModule ( folderName , lastOne ) {
239
243
var self = this ;
240
244
241
- var modulePath = this . configOnHd . paths . modules + "/" + folderName ;
245
+ var modulePath = this . getModuleDir ( ) + "/" + folderName ;
242
246
fs . stat ( modulePath , ( err , stats ) => {
243
247
if ( stats . isDirectory ( ) ) {
244
248
var isInList = false ;
@@ -340,7 +344,7 @@ module.exports = NodeHelper.create(Object.assign({
340
344
} ) ;
341
345
return ;
342
346
}
343
- var modulePath = this . configOnHd . paths . modules + "/" + query . module ;
347
+ var modulePath = this . getModuleDir ( ) + "/" + query . module ;
344
348
let git = simpleGit ( modulePath ) ;
345
349
git . getRemotes ( true , function ( error , result ) {
346
350
if ( error ) {
0 commit comments