mirror of
https://github.com/grafana/grafana.git
synced 2025-02-25 18:55:37 -06:00
Build: Clean up scripts/grunt/options/phantomjs.js (#20503)
This commit is contained in:
parent
d3d595a776
commit
cc21e3efbe
@ -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…
Reference in New Issue
Block a user