From f5c0596c486499982c4c3b03d3538dfccb908272 Mon Sep 17 00:00:00 2001 From: jlukic Date: Thu, 5 Feb 2015 15:00:34 -0500 Subject: [PATCH] Update config --- tasks/config/project/install.js | 2 ++ tasks/install.js | 9 ++------- 2 files changed, 4 insertions(+), 7 deletions(-) diff --git a/tasks/config/project/install.js b/tasks/config/project/install.js index 131ede3e2..48308e52d 100644 --- a/tasks/config/project/install.js +++ b/tasks/config/project/install.js @@ -199,6 +199,7 @@ module.exports = { site : './src/_site', tasks : './tasks', themeConfig : './src/theme.config.example', + themeImport : './src/theme.less', themes : './src/themes', userGulpFile : './tasks/config/npm/gulpfile.js' }, @@ -218,6 +219,7 @@ module.exports = { site : 'src/site/', tasks : 'tasks/', themeConfig : 'src/', + themeImport : 'src/', themes : 'src/themes/' }, diff --git a/tasks/install.js b/tasks/install.js index c7c912e81..f58f15ae8 100644 --- a/tasks/install.js +++ b/tasks/install.js @@ -85,7 +85,6 @@ module.exports = function () { tasks : path.join(updateFolder, currentConfig.base, folders.tasks), definition : path.join(updateFolder, currentConfig.paths.source.definitions), site : path.join(updateFolder, currentConfig.paths.source.site), - themeImport : path.join(updateFolder, source.themeImport), theme : path.join(updateFolder, currentConfig.paths.source.themes) } ; @@ -245,7 +244,7 @@ module.exports = function () { wrench.copyDirSyncRecursive(source.themes, installPaths.theme, settings.wrench.install); console.info('Copying build tools', installPaths.tasks); - wrench.copyDirSyncRecursive(source.modules, installPaths.modules, settings.wrench.install); + //wrench.copyDirSyncRecursive(source.modules, installPaths.modules, settings.wrench.install); wrench.copyDirSyncRecursive(source.tasks, installPaths.tasks, settings.wrench.install); // copy theme import @@ -289,12 +288,8 @@ module.exports = function () { siteVariable = "@siteFolder : '" + pathToSite + "/';" ; - console.log(path.resolve(installPaths.themeConfig)); - console.log(path.resolve(installPaths.site)); - console.log(pathToSite); - // rewrite site variable in theme.less - console.info('Adjusting @siteFolder', siteVariable); + console.info('Adjusting @siteFolder', pathToSite + '/'); if(fs.existsSync(installPaths.themeConfig)) { console.info('Modifying src/theme.config (LESS config)', installPaths.themeConfig);