Browse Source

#2101 finish fix for npm install

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

3
tasks/config/project/install.js

@ -228,7 +228,7 @@ module.exports = {
siteVariable: /@siteFolder .*\'(.*)/mg siteVariable: /@siteFolder .*\'(.*)/mg
}, },
// source paths (relative to tasks/install.js )
// source paths (when installing)
source: { source: {
config : './semantic.json.example', config : './semantic.json.example',
definitions : './src/definitions', definitions : './src/definitions',
@ -239,6 +239,7 @@ module.exports = {
themeConfig : './src/theme.config.example', themeConfig : './src/theme.config.example',
themeImport : './src/theme.less', themeImport : './src/theme.less',
themes : './src/themes', themes : './src/themes',
defaultTheme : './src/themes/default',
userGulpFile : './tasks/config/npm/gulpfile.js' userGulpFile : './tasks/config/npm/gulpfile.js'
}, },

4
tasks/install.js

@ -64,7 +64,7 @@ module.exports = function () {
console.clear(); console.clear();
/* Test NPM
/* Test NPM install
manager = { manager = {
name : 'NPM', name : 'NPM',
root : path.normalize(__dirname + '/../') root : path.normalize(__dirname + '/../')
@ -311,7 +311,7 @@ module.exports = function () {
else { else {
console.info('Creating site theme folder', installPaths.site); 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 Theme Config

Loading…
Cancel
Save