[TIMOB-17227] CLI: Passing empty option value, building the project returns Error #5983
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| @@ -96,6 +96,18 @@ exports.config = function (logger, config, cli) { | |||
| 'project-dir': { | |||
| abbr: 'd', | |||
| callback: function (projectDir) { | |||
| if (typeof projectDir === 'boolean' || projectDir === '') { | |||
There was a problem hiding this comment.
I think we can get rid of the typeof projectDir === 'boolean'.
|
PR updated. |
| projectDir = conf.options['project-dir'].default; | ||
| if (!fs.existsSync(path.join(projectDir, 'tiapp.xml'))) { | ||
| logger.error(__('Invalid project directory "%s" because tiapp.xml not found', projectDir) + '\n'); | ||
| process.exit(1); |
There was a problem hiding this comment.
Instead of logging the error and exiting, instead replace both lines with
return;
It's sorta complicated, but callback() is fired with an option has a value set and callback() can return a modified value. An empty string projectDir is passed in and we are modifying it by returning undefined. Internally this sets cli.argv['project-dir'] to undefined and the CLI's validation system will proceed to prompt for the project directory.
This is more elegant and consistent. Sorry I didn't think of it sooner.
|
It's a good idea! Updated PR. |
|
Code reviewed and tested. APPROVED! |
cb1kenobi
added a commit
that referenced
this pull request
Aug 29, 2014
[TIMOB-17227] CLI: Passing empty option value, building the project returns Error
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
For https://jira.appcelerator.org/browse/TIMOB-17227