X-Git-Url: https://git.octo.it/?p=rrdtool.git;a=blobdiff_plain;f=examples%2Fpiped-demo.pl.in;h=cafb0f5613ca1e67b1f2a293d33cc47a3ed9a1cf;hp=82232fb9d5f2c4c7f13b5c19bf12a4da57ae5ef5;hb=c14d8b6f092d8af34a94c07223d685b5a8369e16;hpb=3203b8b2149ddb630081c35784d5964f32e6dcc2 diff --git a/examples/piped-demo.pl.in b/examples/piped-demo.pl.in index 82232fb..cafb0f5 100755 --- a/examples/piped-demo.pl.in +++ b/examples/piped-demo.pl.in @@ -1,9 +1,5 @@ #! @PERL@ -#makes things work when run without install -use lib qw( ../bindings/perl-piped/blib/lib ../lib/perl ); - -#makes programm work AFTER install use lib qw( @prefix@/lib/perl ); use RRDp; @@ -20,10 +16,12 @@ $SVG = "piped-demo.svg"; $PNG = "piped-demo.png"; # some magic to find the correct rrdtol executable -if ( -x "@prefix@/bin/rrdtool") { - RRDp::start "@prefix@/bin/rrdtool"; -} elsif ( -x "../bin/rrdtool") { - RRDp::start "../bin/rrdtool"; +$prefix="@prefix@"; + +if ( -x "@exec_prefix@/bin/rrdtool") { + RRDp::start "@exec_prefix@/bin/rrdtool"; +} elsif ( -x "../../../bin/rrdtool") { + RRDp::start "../../../bin/rrdtool"; } else { RRDp::start "../src/rrdtool"; } @@ -109,6 +107,9 @@ print "\n\n* Creating $GRUNS PNG graphs: $PNG\n\n"; $now = time; ($user1,$sys1,$real1) = ($RRDp::user,$RRDp::sys,$RRDp::real); +my $local = "".localtime(time()); +$local =~ s/:/\\:/g; + for ($i=0;$i<$GRUNS;$i++) { RRDp::cmd "graph $PNG ", "--title 'Test GRAPH' ", "--imgformat PNG --height 150 --vertical-label 'Dummy Units' ". @@ -128,7 +129,7 @@ RRDp::cmd "graph $PNG ", "--title 'Test GRAPH' ", "GPRINT:calc:MAX:'Max calc\\: %1.2lf %S'", "VRULE:".($now-3600)."#008877:'60 Minutes ago'", "COMMENT:'\\s'", - "COMMENT:'Graph created on\\: ".localtime(time())."\\c'"; + "COMMENT:'Graph created on\\: $local\\c'"; $answer = RRDp::read; }