2martens/2martens.de
1
0
Fork 0
Code Issues 3 Pull Requests Releases Wiki Activity

Fixed exec calls

Browse Source 
Signed-off-by: Jim Martens <github@2martens.de>
This commit is contained in:
Jim Martens
2019-02-27 00:36:36 +01:00
parent 46d026199b
commit e07787e965
1 changed files with 19 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

44
gulpfile.js
View File

@ -6,7 +6,7 @@ const browserSync = require("browser-sync").create();
const cleancss = require("gulp-clean-css"); const cleancss = require("gulp-clean-css");
const concat = require("gulp-concat"); const concat = require("gulp-concat");
const del = require("del"); const del = require("del");
const exec = require("gulp-exec"); const exec = require("child_process").exec;
const gulp = require("gulp"); const gulp = require("gulp");
const gutil = require("gulp-util"); const gutil = require("gulp-util");
const imagemin = require("gulp-imagemin"); const imagemin = require("gulp-imagemin");
@ -65,10 +65,10 @@ gulp.task("build:scripts:global", function () {
paths.jsFiles + "/global/lib" + paths.jsPattern, paths.jsFiles + "/global/lib" + paths.jsPattern,
paths.jsFiles + "/global/*.js" paths.jsFiles + "/global/*.js"
]).pipe(concat("main.js")) ]).pipe(concat("main.js"))
.pipe(terser()) .pipe(terser())
.pipe(gulp.dest(paths.jekyllJsFiles)) .pipe(gulp.dest(paths.jekyllJsFiles))
.pipe(gulp.dest(paths.siteJsFiles)) .pipe(gulp.dest(paths.siteJsFiles))
.on("error", gutil.log); .on("error", gutil.log);
}); });
gulp.task("clean:scripts", function () { gulp.task("clean:scripts", function () {
@ -82,10 +82,10 @@ gulp.task("build:scripts:leaflet", function () {
paths.jsFiles + "/leaflet/leaflet.js", paths.jsFiles + "/leaflet/leaflet.js",
paths.jsFiles + "/leaflet/leaflet-providers.js" paths.jsFiles + "/leaflet/leaflet-providers.js"
]).pipe(concat("leaflet.js")) ]).pipe(concat("leaflet.js"))
.pipe(terser()) .pipe(terser())
.pipe(gulp.dest(paths.jekyllJsFiles)) .pipe(gulp.dest(paths.jekyllJsFiles))
.pipe(gulp.dest(paths.siteJsFiles)) .pipe(gulp.dest(paths.siteJsFiles))
.on("error", gutil.log); .on("error", gutil.log);
}); });
gulp.task("clean:scripts:leaflet", function () { gulp.task("clean:scripts:leaflet", function () {
@ -110,26 +110,20 @@ gulp.task("clean:images", function () {
// Runs jekyll build command. // Runs jekyll build command.
gulp.task("build:jekyll", function () { gulp.task("build:jekyll", function () {
let shellCommand = "bundle exec jekyll build --config _config.yml"; const shellCommand = "bundle exec jekyll build --config _config.yml";
return exec(shellCommand);
return exec(shellCommand)
.on("error", gutil.log);
}); });
// Runs jekyll build command using test config. // Runs jekyll build command using test config.
gulp.task("build:jekyll:test", function () { gulp.task("build:jekyll:test", function () {
let shellCommand = "bundle exec jekyll build --config _config.yml,_config.test.yml"; const shellCommand = "bundle exec jekyll build --config _config.yml,_config.test.yml";
return exec(shellCommand);
return exec(shellCommand)
.on("error", gutil.log);
}); });
// Runs jekyll build command using local config. // Runs jekyll build command using local config.
gulp.task("build:jekyll:local", function () { gulp.task("build:jekyll:local", function () {
let shellCommand = "bundle exec jekyll build --config _config.yml,_config.test.yml,_config.dev.yml"; const shellCommand = "bundle exec jekyll build --config _config.yml,_config.test.yml,_config.dev.yml";
return exec(shellCommand);
return exec(shellCommand)
.on("error", gutil.log);
}); });
// Deletes the entire _site directory. // Deletes the entire _site directory.
@ -150,13 +144,13 @@ gulp.task("build", gulp.series("clean",
// Builds site anew using test config. // Builds site anew using test config.
gulp.task("build:test", gulp.series("clean", gulp.task("build:test", gulp.series("clean",
gulp.parallel("build:scripts", "build:styles"), gulp.parallel("build:scripts", "build:styles"),
"build:jekyll:test")); "build:jekyll:test"));
// Builds site anew using local config. // Builds site anew using local config.
gulp.task("build:local", gulp.series("clean", gulp.task("build:local", gulp.series("clean",
gulp.parallel("build:scripts", "build:styles"), gulp.parallel("build:scripts", "build:styles"),
"build:jekyll:local")); "build:jekyll:local"));
// Default Task: builds site. // Default Task: builds site.
gulp.task("default", gulp.series("build")); gulp.task("default", gulp.series("build"));