X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=bin%2Fdemo%2Ftail_demo;fp=demo%2Ftail_demo;h=e9c995f4ef6e7608584c6476e8aae51a8aa46ed8;hb=3e03d89e861aadf4ce5cd842ecbaa3bd0b7f4729;hp=6011199b079e7d5b5ad78f3bc91ef2e4095bcf1b;hpb=9a1ca27b4e9283a89dbcc627641dafeb07ccacb8;p=urisagit%2FStem.git

diff --git a/demo/tail_demo b/bin/demo/tail_demo
similarity index 68%
rename from demo/tail_demo
rename to bin/demo/tail_demo
index 6011199..e9c995f 100755
--- a/demo/tail_demo
+++ b/bin/demo/tail_demo
@@ -1,17 +1,17 @@
 #!/usr/local/bin/perl -s
 
+use lib qw(../blib/lib blib/lib);
+use Stem::ConfigData;
+$ENV{PATH} .= ':blib/script:../blib/script:demo:.';
+my $xterm = Stem::ConfigData->config('xterm_path');
+my $telnet = Stem::ConfigData->config('telnet_path');
+$conf_path='conf:../conf';
+
 $line_cnt = 10 ;
 $offset = 175 ;
 $base_off = 0 ;
 $xskip = ( $^O eq 'solaris' ) ? 600 : 500 ;
 
-use File::Basename qw( basename );
-$ENV{PATH} .= ':' . basename( $0 ) . ':.';
-for my $prog qw( run_stem xterm telnet ) {
-    die "Can't find $prog in PATH\n" if
-        system( "which $prog >/dev/null 2>&1" ) != 0;
-}
-
 my @children ;
 
 my $tail_dir = 'tail' ;
@@ -21,7 +21,7 @@ $SIG{ 'INT' } = \&cleanup ;
 if ( $s ) {
 
 	$ssfe = 'ssfe' ;
-	$prompt = '-prompt Stem:' ;
+	$prompt = '-prompt "Stem: "' ;
 	$echo = 'console_echo=1'
 }
 
@@ -34,20 +34,16 @@ foreach my $log ( qw( foo bar bar_status ) ) {
 
 
 foreach $cmd ( split /\n/, <<EOT ) {
-xterm -T Archive -n Archive -geometry 80x35+0+0 -e $ssfe $prompt run_stem $echo archive
-xterm -T Monitor -n Monitor -geometry 80x35+$xskip+0 -e $ssfe $prompt run_stem $echo monitor
+xterm -T Archive -n Archive -geometry 80x35+0+0 -e $ssfe $prompt run_stem conf_path=$conf_path $echo archive
+xterm -T Monitor -n Monitor -geometry 80x35+$xskip+0 -e $ssfe $prompt run_stem conf_path=$conf_path $echo monitor
 xterm -T Tail -n Tail -geometry 80x20+275+420
 EOT
 
 	print "$cmd\n" ;
 
-	@cmd = split ' ', $cmd ;
-
-	s/:/: / for @cmd ;
-
 	chdir $tail_dir unless $cmd =~ /run_stem/ ;
 
-	fork_exec( @cmd ) ;
+	fork_exec( $cmd ) ;
 
 	sleep 2 ;
 }
@@ -70,7 +66,7 @@ sub cleanup {
 
 sub fork_exec {
 
-	my( @exec ) = @_ ;
+	my( $exec ) = @_ ;
 
 	if ( $pid = fork() ) {
 
@@ -78,5 +74,5 @@ sub fork_exec {
 		return ;
 	}
 
-	exec @exec ;
+	exec $exec ;
 }