Browse Source

Update config

pull/1785/head
jlukic 9 years ago
parent
commit
f5c0596c48
2 changed files with 4 additions and 7 deletions
  1. 2
      tasks/config/project/install.js
  2. 9
      tasks/install.js

2
tasks/config/project/install.js

@ -199,6 +199,7 @@ module.exports = {
site : './src/_site', site : './src/_site',
tasks : './tasks', tasks : './tasks',
themeConfig : './src/theme.config.example', themeConfig : './src/theme.config.example',
themeImport : './src/theme.less',
themes : './src/themes', themes : './src/themes',
userGulpFile : './tasks/config/npm/gulpfile.js' userGulpFile : './tasks/config/npm/gulpfile.js'
}, },
@ -218,6 +219,7 @@ module.exports = {
site : 'src/site/', site : 'src/site/',
tasks : 'tasks/', tasks : 'tasks/',
themeConfig : 'src/', themeConfig : 'src/',
themeImport : 'src/',
themes : 'src/themes/' themes : 'src/themes/'
}, },

9
tasks/install.js

@ -85,7 +85,6 @@ module.exports = function () {
tasks : path.join(updateFolder, currentConfig.base, folders.tasks), tasks : path.join(updateFolder, currentConfig.base, folders.tasks),
definition : path.join(updateFolder, currentConfig.paths.source.definitions), definition : path.join(updateFolder, currentConfig.paths.source.definitions),
site : path.join(updateFolder, currentConfig.paths.source.site), site : path.join(updateFolder, currentConfig.paths.source.site),
themeImport : path.join(updateFolder, source.themeImport),
theme : path.join(updateFolder, currentConfig.paths.source.themes) theme : path.join(updateFolder, currentConfig.paths.source.themes)
} }
; ;
@ -245,7 +244,7 @@ module.exports = function () {
wrench.copyDirSyncRecursive(source.themes, installPaths.theme, settings.wrench.install); wrench.copyDirSyncRecursive(source.themes, installPaths.theme, settings.wrench.install);
console.info('Copying build tools', installPaths.tasks); 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); wrench.copyDirSyncRecursive(source.tasks, installPaths.tasks, settings.wrench.install);
// copy theme import // copy theme import
@ -289,12 +288,8 @@ module.exports = function () {
siteVariable = "@siteFolder : '" + pathToSite + "/';" siteVariable = "@siteFolder : '" + pathToSite + "/';"
; ;
console.log(path.resolve(installPaths.themeConfig));
console.log(path.resolve(installPaths.site));
console.log(pathToSite);
// rewrite site variable in theme.less // rewrite site variable in theme.less
console.info('Adjusting @siteFolder', siteVariable);
console.info('Adjusting @siteFolder', pathToSite + '/');
if(fs.existsSync(installPaths.themeConfig)) { if(fs.existsSync(installPaths.themeConfig)) {
console.info('Modifying src/theme.config (LESS config)', installPaths.themeConfig); console.info('Modifying src/theme.config (LESS config)', installPaths.themeConfig);

Loading…
Cancel
Save