From b6fcaacb7778a592292722ce6a0688f3fcb012e6 Mon Sep 17 00:00:00 2001 From: Nick O'Leary Date: Mon, 20 Jun 2016 14:41:47 +0100 Subject: [PATCH] Create default settings.js in the user-specified directory Fixes #908 --- CHANGELOG.md | 6 ++++++ red.js | 2 +- 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 454d16293..79ad2dfad 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,9 @@ +#### xxx: unreleased + +Fixes + + - Create default setting.js in user-specified directory. Fixes #908 + #### 0.14.2: Maintenance Release Fixes diff --git a/red.js b/red.js index 1fb84eaf3..c703ae878 100755 --- a/red.js +++ b/red.js @@ -81,7 +81,7 @@ if (parsedArgs.settings) { // NODE_RED_HOME contains user data - use its settings.js settingsFile = path.join(process.env.NODE_RED_HOME,"settings.js"); } else { - var userDir = path.join(parsedArgs.userDir || process.env.HOME || process.env.HOMEPATH || process.env.USERPROFILE,".node-red"); + var userDir = parsedArgs.userDir || path.join(process.env.HOME || process.env.HOMEPATH || process.env.USERPROFILE,".node-red"); var userSettingsFile = path.join(userDir,"settings.js"); if (fs.existsSync(userSettingsFile)) { // $HOME/.node-red/settings.js exists