Merge pull request #3147 from walker0643/next

dump-asy: add prerequisites check; fix empty container names warnings
This commit is contained in:
Ingo Bürk 2018-02-24 09:48:04 +01:00 committed by GitHub
commit a4b07b2c5e
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 7 additions and 1 deletions

View File

@ -15,6 +15,12 @@ use AnyEvent::I3;
use File::Temp; use File::Temp;
use File::Basename; use File::Basename;
use v5.10; use v5.10;
use IPC::Cmd qw[can_run];
# prerequisites check so we can be specific about failures caused
# by not having these tools in the path
can_run('asy') or die 'Please install asymptote';
can_run('gv') or die 'Please install gv';
my $i3 = i3(); my $i3 = i3();
@ -31,7 +37,7 @@ sub dump_node {
my $o = ($n->{orientation} eq 'none' ? "u" : ($n->{orientation} eq 'horizontal' ? "h" : "v")); my $o = ($n->{orientation} eq 'none' ? "u" : ($n->{orientation} eq 'horizontal' ? "h" : "v"));
my $w = (defined($n->{window}) ? $n->{window} : "N"); my $w = (defined($n->{window}) ? $n->{window} : "N");
my $na = $n->{name}; my $na = ($n->{name} or "[Empty]");
$na =~ s/#/\\#/g; $na =~ s/#/\\#/g;
$na =~ s/\$/\\\$/g; $na =~ s/\$/\\\$/g;
$na =~ s/&/\\&/g; $na =~ s/&/\\&/g;