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

Merge pull request #869 from minibikini/master

Browse Source 
fix ProjectInit logging
This commit is contained in:
Eslam λ Hefnawy 2016-03-23 16:53:22 +07:00
commit 887fd61bcd
2 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
lib/actions/FunctionLogs.js
View File

@ -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`);

5
lib/actions/ProjectInit.js
View File

@ -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();