From 50c92f7979b625821cb71a75dd95f5c564347d03 Mon Sep 17 00:00:00 2001 From: Egor Kislitsyn Date: Wed, 23 Mar 2016 16:10:19 +0700 Subject: [PATCH 1/2] fix ProjectInit logging --- lib/actions/ProjectInit.js | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/lib/actions/ProjectInit.js b/lib/actions/ProjectInit.js index 713f35e10..60b0b7770 100644 --- a/lib/actions/ProjectInit.js +++ b/lib/actions/ProjectInit.js @@ -108,7 +108,10 @@ module.exports = function(S) { // Skip if name is provided, or project exists if (_this.evt.options.name) return BbPromise.resolve(); - if (S.hasProject()) return BbPromise.resolve(); + if (S.hasProject()) { + _this.evt.options.name = S.getProject().getName(); + return BbPromise.resolve(); + } name = _this.evt.options.name ? _this.evt.options.name : ('serverless-' + S.utils.generateShortId(6)).toLowerCase(); From 9dfe4fbd7e56099baddd24e1d27e6e3c9b0c4935 Mon Sep 17 00:00:00 2001 From: Egor Kislitsyn Date: Wed, 23 Mar 2016 16:47:48 +0700 Subject: [PATCH 2/2] fix FunctionLogs (#857) --- lib/actions/FunctionLogs.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/actions/FunctionLogs.js b/lib/actions/FunctionLogs.js index 2878bc900..07e871d47 100644 --- a/lib/actions/FunctionLogs.js +++ b/lib/actions/FunctionLogs.js @@ -110,7 +110,7 @@ module.exports = function(S) { throw new SError(`You must be in a function folder to run this command`); } - this.evt.options.name = process.cwd().split(path.sep)[process.cwd().split(path.sep).length - 1]; + this.evt.options.name = SUtils.readFileSync(path.join(process.cwd(), 's-function.json')).name; } if (!S.cli && !this.evt.options.name) throw new SError(`Please provide a function name as a parameter`);