archive-gh-me/serverless
1
0
Fork 0
mirror of https://github.com/serverless/serverless.git synced 2026-01-25 15:07:39 +00:00
Code Issues Projects Releases Wiki Activity

Fix rc lookup

Browse Source
This commit is contained in:
Philipp Muens 2018-08-08 14:01:40 +02:00
parent b7fff31803
commit 8289003b8d
1 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
lib/utils/config/index.js
View File

@ -9,10 +9,12 @@ const fileExistsSync = require('../fs/fileExistsSync');
const readFileSync = require('../fs/readFileSync');
const initialSetup = require('./initialSetup');
let serverlessrcPath = p.join(os.homedir(), '.serverlessrc');
let rcFileBase = 'serverless';
let serverlessrcPath = p.join(os.homedir(), `.${rcFileBase}rc`);
if (process.env.SERVERLESS_PLATFORM_STAGE && process.env.SERVERLESS_PLATFORM_STAGE !== 'prod') {
serverlessrcPath = p.join(os.homedir(), '.serverlessdevrc');
rcFileBase = 'serverlessdev';
serverlessrcPath = p.join(os.homedir(), `.${rcFileBase}rc`);
}
function createConfig() {
@ -48,7 +50,8 @@ function getConfig() {
createConfig();
}
// then return config merged via rc module
return require('rc')('serverless'); // eslint-disable-line
return require('rc')(rcFileBase); // eslint-disable-line
}
function getGlobalConfig() {