From 699c515369ef53bd9fdbcd810a5b573d5e395c28 Mon Sep 17 00:00:00 2001 From: fg2it Date: Sun, 18 Sep 2016 11:45:46 +0000 Subject: [PATCH] enforce unconditional copy --- tasks/options/phantomjs.js | 45 +++++++++++++++++--------------------- 1 file changed, 20 insertions(+), 25 deletions(-) diff --git a/tasks/options/phantomjs.js b/tasks/options/phantomjs.js index 83a7b502f65..ab3bd072652 100644 --- a/tasks/options/phantomjs.js +++ b/tasks/options/phantomjs.js @@ -1,38 +1,33 @@ module.exports = function(config,grunt) { 'use strict'; - grunt.registerTask('phantomjs', 'Copy phantomjs binary from node', function() { + grunt.registerTask('phantomjs', 'Copy phantomjs binary to vendor/', function() { var dest = './vendor/phantomjs/phantomjs'; var confDir = './node_modules/phantomjs-prebuilt/lib/'; - if (!grunt.file.exists(dest)){ + src = config.phjs - src = config.phjs + if (!src){ + var m=grunt.file.read(confDir+"location.js") + var src=/= \"([^\"]*)\"/.exec(m)[1]; - if (!src){ - var m=grunt.file.read(confDir+"location.js") - var src=/= \"([^\"]*)\"/.exec(m)[1]; - - if (!grunt.file.isPathAbsolute(src)) { - src = confDir+src; - } + if (!grunt.file.isPathAbsolute(src)) { + src = confDir+src; } - - try { - grunt.config('copy.phantom_bin', { - src: src, - dest: dest, - options: { mode: true}, - }); - grunt.task.run('copy:phantom_bin'); - } catch (err) { - grunt.verbose.writeln(err); - grunt.fail.warn('No working Phantomjs binary available') - } - - } else { - grunt.log.writeln('Phantomjs already imported from node'); } + + try { + grunt.config('copy.phantom_bin', { + src: src, + dest: dest, + options: { mode: true}, + }); + grunt.task.run('copy:phantom_bin'); + } catch (err) { + grunt.verbose.writeln(err); + grunt.fail.warn('No working Phantomjs binary available') + } + }); };