kenmirrors/MagicMirror
1
0
Fork 0
mirror of https://github.com/MichMich/MagicMirror.git synced 2025-06-27 11:50:00 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #656 from roramirez/env-config-file-pl

Browse Source 
Code change discussion  Pull Request  #653
This commit is contained in:
Michael Teeuw 2017-01-27 17:27:03 +01:00 committed by GitHub
commit 9bd42ac221
1 changed files with 3 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
js/app.js
View File

@ -48,10 +48,9 @@ var App = function() {
// For this check proposed to TestSuite
// https://forum.magicmirror.builders/topic/1456/test-suite-for-magicmirror/8
if (global.configuration_file === undefined ) {
var configFilename = path.resolve(global.root_path + "/config/config.js");
} else {
var configFilename = path.resolve(global.configuration_file);
var configFilename = path.resolve(global.root_path + "/config/config.js");
if (typeof(global.configuration_file) === "undefined" ) {
configFilename = path.resolve(global.configuration_file);
}
try {