diff --git a/bin/blendid.js b/bin/blendid.js index 67d60af69..a0458234c 100755 --- a/bin/blendid.js +++ b/bin/blendid.js @@ -2,11 +2,11 @@ const path = require('path') const additionalArgs = require('minimist')(process.argv.slice(2))._ -const blendidEntryFile = path.resolve(__dirname, '../gulpfile.js/index.js') +const blendidEntryDir = path.resolve(__dirname, '../gulpfile.js') const gulpModulePath = path.dirname(require.resolve('gulp')) const gulpBinaryFile = path.join(gulpModulePath, '/bin/gulp') -let args = ['--gulpfile', blendidEntryFile] +let args = ['--gulpfile', blendidEntryDir] if(additionalArgs.length) { args = args.concat(additionalArgs) diff --git a/gulpfile.js/tasks/http2-upgrade.js b/gulpfile.js/tasks/http2-upgrade.js index 5db169446..4c7b9320b 100644 --- a/gulpfile.js/tasks/http2-upgrade.js +++ b/gulpfile.js/tasks/http2-upgrade.js @@ -10,10 +10,10 @@ gulp.task('http2-upgrade', function() { del([projectPath(PATH_CONFIG.src, PATH_CONFIG.stylesheets.src)], { force: true }) log(colors.green('Cleaned stylesheets directory')) - const configStream = gulp.src('../extras/http2/**/*') + const configStream = gulp.src('extras/http2/**/*') .pipe(gulp.dest(projectPath())) - const srcStream = gulp.src(['../src/stylesheets', '../src/javascripts', '../src/html']) + const srcStream = gulp.src(['src/stylesheets', 'src/javascripts', 'src/html']) .pipe(gulp.dest(projectPath(PATH_CONFIG.src))) log(colors.green('Created HTTP/2 ready stylesheets directory')) diff --git a/gulpfile.js/tasks/init-config.js b/gulpfile.js/tasks/init-config.js index 4ff4199c4..27a44d783 100644 --- a/gulpfile.js/tasks/init-config.js +++ b/gulpfile.js/tasks/init-config.js @@ -4,8 +4,8 @@ var colors = require('ansi-colors') var projectPath = require('../lib/projectPath') var merge = require('merge-stream') -gulp.task('init-config', function() { - var configStream = gulp.src(['./path-config.json', './task-config.js']) +gulp.task('init-config', function () { + var configStream = gulp.src(['gulpfile.js/path-config.json', 'gulpfile.js/task-config.js']) .pipe(gulp.dest(projectPath('config'))) log(colors.green('Adding default path-config.json and task-config.js files to ./config/')) diff --git a/gulpfile.js/tasks/init-craft.js b/gulpfile.js/tasks/init-craft.js index f659be106..c855febf0 100644 --- a/gulpfile.js/tasks/init-craft.js +++ b/gulpfile.js/tasks/init-craft.js @@ -5,10 +5,10 @@ const mergeStream = require('merge-stream') const projectPath = require('../lib/projectPath') gulp.task('init-craft', function() { - const configStream = gulp.src(['../extras/craft/**/*', '*!ASSET-README.md']) + const configStream = gulp.src(['extras/craft/**/*', '!**/ASSETS-README.md']) .pipe(gulp.dest(projectPath())) - const srcStream = gulp.src(['../src/**/*', '*.gitkeep', '!../src/html{,/**}', '!../src/static{,/**}']) + const srcStream = gulp.src(['src/**/*', 'src/**/.gitkeep', '!src/html{,/**}', '!src/static{,/**}']) .pipe(gulp.dest(projectPath(PATH_CONFIG.src))) diff --git a/gulpfile.js/tasks/init-drupal.js b/gulpfile.js/tasks/init-drupal.js index e20c3d3c2..e0ee472da 100644 --- a/gulpfile.js/tasks/init-drupal.js +++ b/gulpfile.js/tasks/init-drupal.js @@ -10,14 +10,14 @@ const projectPath = require('../lib/projectPath') gulp.task('init-drupal', function() { const envBasename = path.basename(process.env.INIT_CWD) - const configStream = gulp.src(['../extras/drupal/**/*', '!../extras/drupal/src/', '!../extras/drupal/src/**/*', '!**/README.md']) + const configStream = gulp.src(['extras/drupal/**/*', '!extras/drupal/src/', '!extras/drupal/src/**/*', '!**/README.md']) .pipe(rename(function (filepath) { filepath.basename = filepath.basename.replace('THEMENAME', envBasename); })) .pipe(replace('THEMENAME', envBasename)) .pipe(gulp.dest(projectPath())) - const srcStream = gulp.src(['../extras/drupal/src/**/*', '*.gitkeep']) + const srcStream = gulp.src(['extras/drupal/src/**/*', 'extras/drupal/src/**/.gitkeep']) .pipe(gulp.dest(projectPath(PATH_CONFIG.src))) log(colors.green('Created config/path-config.json')) diff --git a/gulpfile.js/tasks/init-rails.js b/gulpfile.js/tasks/init-rails.js index 143046d87..e9f3f9585 100644 --- a/gulpfile.js/tasks/init-rails.js +++ b/gulpfile.js/tasks/init-rails.js @@ -4,7 +4,7 @@ var colors = require('ansi-colors') var projectPath = require('../lib/projectPath') gulp.task('init-rails', function() { - var stream = gulp.src(['../extras/rails/**/*', '*!README.md']) + var stream = gulp.src(['extras/rails/**/*', 'extras/rails/**/.gitkeep', '!**/ASSETS-README.md']) .pipe(gulp.dest(projectPath())) log(colors.green('Created app/helpers/blendid_asset_helper.rb')) diff --git a/gulpfile.js/tasks/init.js b/gulpfile.js/tasks/init.js index 209fa3da4..6fc66ffa1 100644 --- a/gulpfile.js/tasks/init.js +++ b/gulpfile.js/tasks/init.js @@ -5,13 +5,13 @@ var projectPath = require('../lib/projectPath') var merge = require('merge-stream') gulp.task('init', function() { - var defaultStream = gulp.src(['../extras/default/**/*']) + var defaultStream = gulp.src(['extras/default/**/*', 'extras/default/**/.*']) .pipe(gulp.dest(projectPath())) - var configStream = gulp.src(['./path-config.json', './task-config.js']) + var configStream = gulp.src(['gulpfile.js/path-config.json', 'gulpfile.js/task-config.js']) .pipe(gulp.dest(projectPath('config'))) - var srcStream = gulp.src(['../src/**/*', '*.gitkeep']) + var srcStream = gulp.src(['src/**/*', 'src/**/.gitkeep']) .pipe(gulp.dest(projectPath(PATH_CONFIG.src))) log(colors.green('Generating default Blendid project files'))