commit 73a2541d5e267b39592180cad9964d7f8ece5291
author Raphael von der Grün <raphinesse@gmail.com> Wed May 16 03:19:03 2018 +0200
committer Raphael von der Grün <raphinesse@gmail.com> Thu Aug 16 16:57:40 2018 +0200
tree ba23884750c81816381ba35a3b1ea33056e5ae27
parent dca0e5b5c2ec8d203ec28ce90476459534e10f8d

Cleanup create

src/cli.js

diff --git a/src/cli.js b/src/cli.js
index f24ea01..065626c 100644
--- a/src/cli.js
+++ b/src/cli.js
@@ -492,15 +492,12 @@
     }
 }
 
-function create (undashed, args) {
-    var cfg; // Create config
-    var customWww; // Template path
-    var wwwCfg; // Template config
-
+function create ([_, dir, id, name, cfgJson], args) {
     // If we got a fourth parameter, consider it to be JSON to init the config.
-    if (undashed[4]) { cfg = JSON.parse(undashed[4]); } else { cfg = {}; }
+    var cfg = JSON.parse(cfgJson || '{}');
 
-    customWww = args['copy-from'] || args['link-to'] || args.template;
+    // Template path
+    var customWww = args['copy-from'] || args['link-to'] || args.template;
 
     if (customWww) {
         if (!args.template && !args['copy-from'] && customWww.indexOf('http') === 0) {
@@ -512,18 +509,14 @@
         // Resolve tilda
         if (customWww.substr(0, 1) === '~') { customWww = path.join(process.env.HOME, customWww.substr(1)); }
 
-        wwwCfg = {
+        // Template config
+        var wwwCfg = {
             url: customWww,
-            template: false,
-            link: false
+            template: 'template' in args,
+            link: 'link-to' in args
         };
 
-        if (args['link-to']) {
-            wwwCfg.link = true;
-        }
-        if (args.template) {
-            wwwCfg.template = true;
-        } else if (args['copy-from']) {
+        if ('copy-from' in args) {
             logger.warn('Warning: --copy-from option is being deprecated. Consider using --template instead.');
             wwwCfg.template = true;
         }
@@ -531,10 +524,5 @@
         cfg.lib = cfg.lib || {};
         cfg.lib.www = wwwCfg;
     }
-    return cordova.create(undashed[1] // dir to create the project in
-        , undashed[2] // App id
-        , undashed[3] // App name
-        , cfg
-        , events || undefined
-    );
+    return cordova.create(dir, id, name, cfg, events || undefined);
 }