Skip to content

Commit

Permalink
Tweak paths for consistency
Browse files Browse the repository at this point in the history
  • Loading branch information
brzpegasus committed Mar 21, 2015
1 parent 421f647 commit 15f49ba
Show file tree
Hide file tree
Showing 3 changed files with 8 additions and 9 deletions.
10 changes: 5 additions & 5 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@ The following command line options let you specify a target environment or chang
* Target environment for the Ember app build
* Alias: `-e <value>, -dev (--environment=development), -prod (--environment=production)`

**`--output-path`** _(Path)_ (Default: 'dist/')
**`--output-path`** _(String)_ (Default: 'dist/')
* Output directory for the Ember app build
* Aliases: `-o <value>`

Expand Down Expand Up @@ -77,24 +77,24 @@ You can pass the following command line options:
* Target environment for the Ember app build
* Alias: `-e <value>, -dev (--environment=development), -prod (--environment=production)`

**`--output-path`** _(path)_ (Default: 'dist/')
**`--output-path`** _(String)_ (Default: 'dist/')
* Output directory for the Ember app build
* Aliases: `-o <value>`

**`--config-file`** _(String)_ (Default: './config/nw-package.js')
**`--config-file`** _(String)_ (Default: 'config/nw-package.js')
* Configuration file for `node-webkit-builder`
* Aliases: `-f <value>`

### Configuring node-webkit-builder

`node-webkit-builder` itself comes with a lot of build [options](https://github.com/mllrsohn/node-webkit-builder#options). You can customize any of those settings by supplying a configuration file named `./config/nw-package.js` in your project, or call `ember nw:package` with the `--config-file` option set to the desired file.
`node-webkit-builder` itself comes with a lot of build [options](https://github.com/mllrsohn/node-webkit-builder#options). You can customize any of those settings by supplying a configuration file named `config/nw-package.js` in your project, or call `ember nw:package` with the `--config-file` option set to the desired file.

#### Configuration File

The configuration file must be a node module that exports a plain object with the names of the options you wish to override as keys:

```javascript
// ./config/nw-package.js
// config/nw-package.js

module.exports = {
appName: 'my-nw-app',
Expand Down
4 changes: 2 additions & 2 deletions lib/commands/nw-package.js
Original file line number Diff line number Diff line change
Expand Up @@ -11,8 +11,8 @@ module.exports = {

availableOptions: [
{ name: 'environment', type: String, default: 'production', aliases: ['e', { 'dev' : 'development' }, { 'prod' : 'production' }] },
{ name: 'output-path', type: path, default: 'dist/', aliases: ['o'] },
{ name: 'config-file', type: String, default: './config/nw-package.js', aliases: ['f'] }
{ name: 'output-path', type: String, default: 'dist/', aliases: ['o'] },
{ name: 'config-file', type: String, default: 'config/nw-package.js', aliases: ['f'] }
],

buildApp: function(options) {
Expand Down
3 changes: 1 addition & 2 deletions lib/commands/nw.js
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
'use strict';

var path = require('path');
var spawn = require('child_process').spawn;
var chalk = require('chalk');
var RSVP = require('rsvp');
Expand All @@ -13,7 +12,7 @@ module.exports = {

availableOptions: [
{ name: 'environment', type: String, default: 'development', aliases: ['e', { 'dev': 'development' }, { 'prod': 'production' }] },
{ name: 'output-path', type: path, default: 'dist/', aliases: ['o'] }
{ name: 'output-path', type: String, default: 'dist/', aliases: ['o'] }
],

buildWatch: function(options) {
Expand Down

0 comments on commit 15f49ba

Please sign in to comment.