From 8247d5eef37500589d8c409cf96cf51506e4e71a Mon Sep 17 00:00:00 2001
From: muxator <a.mux@inwind.it>
Date: Wed, 22 Aug 2018 00:01:27 +0200
Subject: [PATCH] settings: use makeAbsolute() for locating settings.json and
 credentials.json

This should look to consistent locations when looking for relative paths,
without depending on current working directory.
For absolute paths, nothing changes.
---
 src/node/utils/Settings.js | 16 +++-------------
 1 file changed, 3 insertions(+), 13 deletions(-)

diff --git a/src/node/utils/Settings.js b/src/node/utils/Settings.js
index bb89d42cf..6514d2331 100644
--- a/src/node/utils/Settings.js
+++ b/src/node/utils/Settings.js
@@ -341,20 +341,10 @@ exports.getEpVersion = function() {
 
 exports.reloadSettings = function reloadSettings() {
   // Discover where the settings file lives
-  var settingsFilename = argv.settings || "settings.json";
-
+  var settingsFilename = absolutePaths.makeAbsolute(argv.settings || "settings.json");
+  
   // Discover if a credential file exists
-  var credentialsFilename = argv.credentials || "credentials.json";
-
-  if (path.resolve(settingsFilename)===settingsFilename) {
-    settingsFilename = path.resolve(settingsFilename);
-  } else {
-    settingsFilename = path.resolve(path.join(exports.root, settingsFilename));
-  }
-
-  if (path.resolve(credentialsFilename)===credentialsFilename) {
-    credentialsFilename = path.resolve(credentialsFilename);
-  }
+  var credentialsFilename = absolutePaths.makeAbsolute(argv.credentials || "credentials.json");
 
   var settingsStr, credentialsStr;
   try{