Build: Clean up scripts/grunt/options/phantomjs.js (#20503)

pull/20526/head
Arve Knudsen 6 years ago committed by GitHub
parent d3d595a776
commit cc21e3efbe
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
  1. 12
      scripts/grunt/options/phantomjs.js

@ -2,7 +2,6 @@ module.exports = function(config,grunt) {
'use strict';
grunt.registerTask('phantomjs', 'Copy phantomjs binary to vendor/', function() {
var dest = './tools/phantomjs/phantomjs';
var confDir = './node_modules/phantomjs-prebuilt/lib/';
@ -10,12 +9,10 @@ module.exports = function(config,grunt) {
dest += ".exe";
}
src = config.phjs
if (!src){
var m=grunt.file.read(confDir+"location.js")
var src=/= \"([^\"]*)\"/.exec(m)[1];
var src = config.phjs;
if (!src) {
var m = grunt.file.read(confDir+"location.js");
src = /= \"([^\"]*)\"/.exec(m)[1];
if (!grunt.file.isPathAbsolute(src)) {
src = confDir+src;
}
@ -32,6 +29,5 @@ module.exports = function(config,grunt) {
grunt.verbose.writeln(err);
grunt.fail.warn('No working Phantomjs binary available')
}
});
};

Loading…
Cancel
Save