diff --git a/lib/cmds/template_generator.js b/lib/cmds/template_generator.js index 4fc77971..10e99e40 100644 --- a/lib/cmds/template_generator.js +++ b/lib/cmds/template_generator.js @@ -53,9 +53,6 @@ class TemplateGenerator { } getExternalProject(uri) { - const constants = require('../constants'); - const RAW_URL = 'https://github.com/'; - let match = uri.match( /\.[a-z]+\/([-a-zA-Z0-9@:%_+.~#?&\/=]+)/ ); @@ -63,17 +60,17 @@ class TemplateGenerator { let url, folder; if (uri.startsWith('http')) { - url = uri + "/archive/master.zip" - folder = match[1] + url = uri + "/archive/master.zip"; + folder = match[1]; } else if (uri.startsWith('github')) { - url = "https://" + uri + "/archive/master.zip" - folder = match[1] + url = "https://" + uri + "/archive/master.zip"; + folder = match[1]; } else if (uri.split('/').length === 2) { - url = "https://github.com/" + uri + "/archive/master.zip" - folder = uri + url = "https://github.com/" + uri + "/archive/master.zip"; + folder = uri; } else if (uri.indexOf('/') === -1) { - url = "https://github.com/embark-framework/embark-" + uri + "-template/archive/master.zip" - folder = "embark-framework/embark-" + uri + "-template" + url = "https://github.com/embark-framework/embark-" + uri + "-template/archive/master.zip"; + folder = "embark-framework/embark-" + uri + "-template"; } return { diff --git a/lib/utils/utils.js b/lib/utils/utils.js index b3a2fb38..143b03ec 100644 --- a/lib/utils/utils.js +++ b/lib/utils/utils.js @@ -176,8 +176,7 @@ function extractTar(filename, packageDirectory, cb) { function extractZip(filename, packageDirectory, cb) { const decompress = require('decompress'); - decompress(filename, packageDirectory).then(files => { - console.log('done!'); + decompress(filename, packageDirectory).then((_files) => { cb(); }); }