[4/8] cordova-lib git commit: Second attempt at fix for CB-13451

[st...@apache.org]

Second attempt at fix for CB-13451


Project: http://git-wip-us.apache.org/repos/asf/cordova-lib/repo
Commit: http://git-wip-us.apache.org/repos/asf/cordova-lib/commit/c3ea1592
Tree: http://git-wip-us.apache.org/repos/asf/cordova-lib/tree/c3ea1592
Diff: http://git-wip-us.apache.org/repos/asf/cordova-lib/diff/c3ea1592

Branch: refs/heads/master
Commit: c3ea159244c585e1e62cb4d9a5b65a1403802e26
Parents: 09f20b9
Author: Roland <ro...@fraction7.com>
Authored: Thu Oct 19 21:45:23 2017 +0100
Committer: Steve Gill <st...@gmail.com>
Committed: Fri Oct 20 16:46:21 2017 -0700

----------------------------------------------------------------------
 src/plugman/init-defaults.js | 29 +++++++++++++++--------------
 1 file changed, 15 insertions(+), 14 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cordova-lib/blob/c3ea1592/src/plugman/init-defaults.js
----------------------------------------------------------------------
diff --git a/src/plugman/init-defaults.js b/src/plugman/init-defaults.js
index f3c5ada..78efde2 100644
--- a/src/plugman/init-defaults.js
+++ b/src/plugman/init-defaults.js
@@ -19,7 +19,7 @@
 
 /* global dirname */
 /* global config */
-/* global pkg */
+/* global package */
 /* global basename */
 /* global yes */
 /* global prompt */
@@ -55,17 +55,18 @@ function readDeps (test) {
     };
 }
 
-var name = pkg.name || defaults.id || basename;
+/* eslint-disable */
+var name = package.name || defaults.id || basename;
 exports.name = yes ? name : prompt('name', name);
 
-var version = pkg.version ||
+var version = package.version ||
               defaults.version ||
               config.get('init.version') ||
               config.get('init-version') ||
               '1.0.0';
 exports.version = yes ? version : prompt('version', version);
 
-if (!pkg.description) {
+if (!package.description) {
     if (defaults.description) {
         exports.description = defaults.description;
     } else {
@@ -73,7 +74,7 @@ if (!pkg.description) {
     }
 }
 
-if (!pkg.cordova) {
+if (!package.cordova) {
     exports.cordova = {};
     if (defaults.id) {
         exports.cordova.id = defaults.id;
@@ -83,15 +84,15 @@ if (!pkg.cordova) {
     }
 }
 
-if (!pkg.dependencies) {
+if (!package.dependencies) {
     exports.dependencies = readDeps(false);
 }
 
-if (!pkg.devDependencies) {
+if (!package.devDependencies) {
     exports.devDependencies = readDeps(true);
 }
 
-if (!pkg.repository) {
+if (!package.repository) {
     exports.repository = function (cb) {
         fs.readFile('.git/config', 'utf8', function (er, gconf) {
             if (er || !gconf) {
@@ -116,7 +117,7 @@ if (!pkg.repository) {
     };
 }
 
-if (!pkg.keywords) {
+if (!package.keywords) {
     if (defaults.keywords) {
         exports.keywords = defaults.keywords;
     } else {
@@ -129,14 +130,13 @@ if (!pkg.keywords) {
     }
 }
 
-if (!pkg.engines) {
+if (!package.engines) {
     if (defaults.engines && defaults.engines.length > 0) {
         exports.engines = defaults.engines;
     }
 }
 
-/* eslint-disable indent */
-if (!pkg.author) {
+if (!package.author) {
     exports.author = (config.get('init.author.name') ||
                      config.get('init-author-name')) ?
     {
@@ -149,10 +149,11 @@ if (!pkg.author) {
     }
         : prompt('author');
 }
-/* eslint-enable indent */
-var license = pkg.license ||
+var license = package.license ||
               defaults.license ||
               config.get('init.license') ||
               config.get('init-license') ||
               'ISC';
+/* eslint-enable */
+
 exports.license = yes ? license : prompt('license', license);


---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@cordova.apache.org
For additional commands, e-mail: commits-help@cordova.apache.org