From 15f49ba1df17d3b4ce0b037a35fe2f7d829e4ef6 Mon Sep 17 00:00:00 2001 From: Estelle DeBlois Date: Sat, 21 Mar 2015 12:57:26 -0400 Subject: [PATCH] Tweak paths for consistency --- README.md | 10 +++++----- lib/commands/nw-package.js | 4 ++-- lib/commands/nw.js | 3 +-- 3 files changed, 8 insertions(+), 9 deletions(-) diff --git a/README.md b/README.md index 3b4b971..214a269 100644 --- a/README.md +++ b/README.md @@ -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 , -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 ` @@ -77,24 +77,24 @@ You can pass the following command line options: * Target environment for the Ember app build * Alias: `-e , -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 ` -**`--config-file`** _(String)_ (Default: './config/nw-package.js') +**`--config-file`** _(String)_ (Default: 'config/nw-package.js') * Configuration file for `node-webkit-builder` * Aliases: `-f ` ### 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', diff --git a/lib/commands/nw-package.js b/lib/commands/nw-package.js index 7fb7d8f..a5ebdf2 100644 --- a/lib/commands/nw-package.js +++ b/lib/commands/nw-package.js @@ -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) { diff --git a/lib/commands/nw.js b/lib/commands/nw.js index b751437..365d1db 100644 --- a/lib/commands/nw.js +++ b/lib/commands/nw.js @@ -1,6 +1,5 @@ 'use strict'; -var path = require('path'); var spawn = require('child_process').spawn; var chalk = require('chalk'); var RSVP = require('rsvp'); @@ -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) {