diff --git a/tasks/config/project/install.js b/tasks/config/project/install.js index c271274c9..10a2881bc 100644 --- a/tasks/config/project/install.js +++ b/tasks/config/project/install.js @@ -228,7 +228,7 @@ module.exports = { siteVariable: /@siteFolder .*\'(.*)/mg }, - // source paths (relative to tasks/install.js ) + // source paths (when installing) source: { config : './semantic.json.example', definitions : './src/definitions', @@ -239,6 +239,7 @@ module.exports = { themeConfig : './src/theme.config.example', themeImport : './src/theme.less', themes : './src/themes', + defaultTheme : './src/themes/default', userGulpFile : './tasks/config/npm/gulpfile.js' }, diff --git a/tasks/install.js b/tasks/install.js index 91ecdbb07..97b1f3a43 100644 --- a/tasks/install.js +++ b/tasks/install.js @@ -64,7 +64,7 @@ module.exports = function () { console.clear(); - /* Test NPM + /* Test NPM install manager = { name : 'NPM', root : path.normalize(__dirname + '/../') @@ -311,7 +311,7 @@ module.exports = function () { else { console.info('Creating site theme folder', installPaths.site); } - wrench.copyDirSyncRecursive(source.site, installPaths.site, settings.wrench.site); + wrench.copyDirSyncRecursive(source.site, installPaths.site, settings.wrench.merge); /*-------------- Theme Config