diff --git a/.gitignore b/.gitignore index 8abd0d17cbd..f77072fde1e 100644 --- a/.gitignore +++ b/.gitignore @@ -6,6 +6,7 @@ awsconfig /emails/dist /public_gen /tmp +vendor/phantomjs/phantomjs docs/AWS_S3_BUCKET docs/GIT_BRANCH diff --git a/tasks/options/phantomjs.js b/tasks/options/phantomjs.js index ee5aa996d1d..7eac7cb36ac 100644 --- a/tasks/options/phantomjs.js +++ b/tasks/options/phantomjs.js @@ -10,7 +10,7 @@ module.exports = function(config,grunt) { var m=grunt.file.read(confDir+"location.js") var src=/= \"([^\"]*)\"/.exec(m)[1]; - + if (!grunt.file.isPathAbsolute(src)) { src = confDir+src; } @@ -18,16 +18,19 @@ module.exports = function(config,grunt) { var exec = require('child_process').execFileSync; try { - var ph=exec(src,['-v'], { stdio: 'ignore' }); - grunt.verbose.writeln('Using '+ src); - grunt.file.copy(src, dest, { encoding: null }); + 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'); + grunt.log.writeln('Phantomjs already imported from node'); } }); };