From 57975dcf859dec8a548575c892bbe62e9b2dca11 Mon Sep 17 00:00:00 2001 From: Kevin Chappell Date: Sat, 1 Oct 2016 14:48:01 +0100 Subject: [PATCH] Bugfix: gulp font-edit on windows --- gulpfile.babel.js | 23 +++++++++-------------- package.json | 3 ++- 2 files changed, 11 insertions(+), 15 deletions(-) diff --git a/gulpfile.babel.js b/gulpfile.babel.js index 1dcea41d0..455d23faf 100644 --- a/gulpfile.babel.js +++ b/gulpfile.babel.js @@ -54,25 +54,20 @@ var plugins = gulpPlugins(), * @return {void} logs to terminal. */ fontEdit = () => { - let openFont = { - linux: `/opt/google/chrome/google-chrome --enable-plugins ${pkg.config.fontServer}/$(cat .fontello)`, - darwin: `open -a "Google Chrome" ${pkg.config.fontServer}/$(cat .fontello)`, - win32: `start chrome "${pkg.config.fontServer}/$(cat .fontello)"` - }; - - if (!openFont[platform]) { - return false; - } + let fs = require('fs'), + open = require('opener'); // Connects to font server to get a fresh token for our editing session. // sends current config in the process. let getFontToken = `curl --silent --show-error --fail --output .fontello --form "config=@${files.formBuilder.fonts}/config.json" ${pkg.config.fontServer} \n`; - return exec(getFontToken + openFont[platform], function(err, stdout, stderr) { - console.log(stdout); - if (stderr) { - console.error(err, stderr); - } + return fs.readFile('.fontello', function(error, token) { + return exec(getFontToken, function(err, stdout, stderr) { + open(`${pkg.config.fontServer}/${token}`); + if (stderr) { + console.error(err, stderr); + } + }); }); }, diff --git a/package.json b/package.json index 11acbfd4e..6dd6344da 100644 --- a/package.json +++ b/package.json @@ -100,7 +100,8 @@ "gulp-sourcemaps": "^1.6.0", "gulp-uglify": "^1.5.3", "jshint": "^2.9.1", - "jshint-stylish": "^2.1.0" + "jshint-stylish": "^2.1.0", + "opener": "^1.4.2" }, "engines": {} }