Skip to content

Commit

Permalink
[Packager] Fix the --root, --assetRoots, and --platform options
Browse files Browse the repository at this point in the history
Summary:
Looks like these options were handled as booleans when they should be handled as strings. Explicitly specify them as strings.

Closes facebook/react-native#1377
Github Author: James Ide <ide@jameside.com>

Test Plan:
 `packager/packager.sh --root A --root B` works. Also tested `packager/packager.sh --root A,B`.
  • Loading branch information
ide committed May 26, 2015
1 parent a6a8432 commit ea9ca46
Showing 1 changed file with 10 additions and 6 deletions.
16 changes: 10 additions & 6 deletions packager.js
Original file line number Diff line number Diff line change
Expand Up @@ -36,14 +36,18 @@ var webSocketProxy = require('./webSocketProxy.js');
var options = parseCommandLine([{
command: 'port',
default: 8081,
type: 'string',
}, {
command: 'root',
type: 'string',
description: 'add another root(s) to be used by the packager in this project',
}, {
command: 'assetRoots',
type: 'string',
description: 'specify the root directories of app assets'
}, {
command: 'platform',
type: 'string',
default: 'ios',
description: 'Specify the platform-specific blacklist (ios, android, web).'
}, {
Expand All @@ -65,13 +69,13 @@ if (options.projectRoots) {
}

if (options.root) {
if (typeof options.root === 'string') {
options.projectRoots.push(path.resolve(options.root));
} else {
options.root.forEach(function(root) {
options.projectRoots.push(path.resolve(root));
});
if (!Array.isArray(options.root)) {
options.root = options.root.split(',');
}

options.root.forEach(function(root) {
options.projectRoots.push(path.resolve(root));
});
}

if (options.assetRoots) {
Expand Down

0 comments on commit ea9ca46

Please sign in to comment.