opensource/grafana
1
0
Fork 0
mirror of https://github.com/grafana/grafana.git synced 2025-08-01 03:21:51 +08:00
Code Issues Packages Projects Releases Wiki Activity

fix(phantomjs binary): fixed PR #2832 so that it works on linux, now phantomjs based server side rendershould work on mac and linux, maybe even windows

Browse Source
This commit is contained in:
Torkel Ödegaard
2015-09-29 15:36:13 +02:00
parent 8b029388a5
commit 81a660eae4
2 changed files with 10 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
.gitignore vendored
View File

@ -6,6 +6,7 @@ awsconfig
/emails/dist /emails/dist
/public_gen /public_gen
/tmp /tmp
vendor/phantomjs/phantomjs
docs/AWS_S3_BUCKET docs/AWS_S3_BUCKET
docs/GIT_BRANCH docs/GIT_BRANCH

15
tasks/options/phantomjs.js
View File

@ -10,7 +10,7 @@ module.exports = function(config,grunt) {
var m=grunt.file.read(confDir+"location.js") var m=grunt.file.read(confDir+"location.js")
var src=/= \"([^\"]*)\"/.exec(m)[1]; var src=/= \"([^\"]*)\"/.exec(m)[1];
if (!grunt.file.isPathAbsolute(src)) { if (!grunt.file.isPathAbsolute(src)) {
src = confDir+src; src = confDir+src;
} }
@ -18,16 +18,19 @@ module.exports = function(config,grunt) {
var exec = require('child_process').execFileSync; var exec = require('child_process').execFileSync;
try { try {
var ph=exec(src,['-v'], { stdio: 'ignore' }); grunt.config('copy.phantom_bin', {
grunt.verbose.writeln('Using '+ src); src: src,
grunt.file.copy(src, dest, { encoding: null }); dest: dest,
options: { mode: true},
});
grunt.task.run('copy:phantom_bin');
} catch (err) { } catch (err) {
grunt.verbose.writeln(err); grunt.verbose.writeln(err);
grunt.fail.warn('No working Phantomjs binary available') grunt.fail.warn('No working Phantomjs binary available')
} }
} else { } else {
grunt.log.writeln('Phantomjs already imported from node'); grunt.log.writeln('Phantomjs already imported from node');
} }
}); });
}; };