added plist as top level dependency, fixed jshint errors, fixed mistake
Project: http://git-wip-us.apache.org/repos/asf/cordova-ios/repo Commit: http://git-wip-us.apache.org/repos/asf/cordova-ios/commit/fa3830de Tree: http://git-wip-us.apache.org/repos/asf/cordova-ios/tree/fa3830de Diff: http://git-wip-us.apache.org/repos/asf/cordova-ios/diff/fa3830de Branch: refs/heads/master Commit: fa3830de10995058a000169f53175fa5bbc3d08e Parents: 2465205 Author: Steve Gill <stevengil...@gmail.com> Authored: Thu Feb 25 18:11:36 2016 -0800 Committer: Steve Gill <stevengil...@gmail.com> Committed: Fri Feb 26 14:41:15 2016 -0800 ---------------------------------------------------------------------- bin/lib/create.js | 4 ++-- node_modules/plist/package.json | 5 +++-- 2 files changed, 5 insertions(+), 4 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cordova-ios/blob/fa3830de/bin/lib/create.js ---------------------------------------------------------------------- diff --git a/bin/lib/create.js b/bin/lib/create.js index 9eb48e5..530ef9d 100755 --- a/bin/lib/create.js +++ b/bin/lib/create.js @@ -214,7 +214,7 @@ exports.createProject = function(project_path, package_name, project_name, opts, copyTemplateFiles(project_path, project_name, project_template_dir, package_name); //CordovaLib stuff - copyJsAndCordovaLib(project_path, project_name, package_name); + copyJsAndCordovaLib(project_path, project_name, use_shared); copyScripts(project_path); events.emit('log', generateDoneMessage('create', use_shared)); @@ -225,7 +225,7 @@ exports.updateProject = function(projectPath, opts, events) { var projectName = detectProjectName(projectPath); var project_template_dir = path.join(ROOT, 'bin', 'templates', 'project'); //Get package_name from existing projectName-Info.plist file - var package_name = plist.parse(fs.readFileSync(path.join(projectPath, projectName, projectName+'-Info.plist'), 'utf8'))['CFBundleIdentifier']; + var package_name = plist.parse(fs.readFileSync(path.join(projectPath, projectName, projectName+'-Info.plist'), 'utf8')).CFBundleIdentifier; setShellFatal(true, function() { copyTemplateFiles(projectPath, projectName, project_template_dir, package_name); copyJsAndCordovaLib(projectPath, projectName, opts.link); http://git-wip-us.apache.org/repos/asf/cordova-ios/blob/fa3830de/node_modules/plist/package.json ---------------------------------------------------------------------- diff --git a/node_modules/plist/package.json b/node_modules/plist/package.json index 8c991e8..d7e7cc0 100644 --- a/node_modules/plist/package.json +++ b/node_modules/plist/package.json @@ -2,7 +2,7 @@ "_args": [ [ "plist@^1.2.0", - "/Users/steveng/repo/cordova/cordova-ios/node_modules/cordova-common" + "/Users/steveng/repo/cordova/cordova-ios" ] ], "_from": "plist@>=1.2.0 <2.0.0", @@ -26,13 +26,14 @@ "type": "range" }, "_requiredBy": [ + "/", "/cordova-common" ], "_resolved": "http://registry.npmjs.org/plist/-/plist-1.2.0.tgz";, "_shasum": "084b5093ddc92506e259f874b8d9b1afb8c79593", "_shrinkwrap": null, "_spec": "plist@^1.2.0", - "_where": "/Users/steveng/repo/cordova/cordova-ios/node_modules/cordova-common", + "_where": "/Users/steveng/repo/cordova/cordova-ios", "author": { "email": "nat...@tootallnate.net", "name": "Nathan Rajlich" --------------------------------------------------------------------- To unsubscribe, e-mail: commits-unsubscr...@cordova.apache.org For additional commands, e-mail: commits-h...@cordova.apache.org
