2 |
## $Id$ |
## $Id$ |
3 |
## --------------------------------------------------------------------------- |
## --------------------------------------------------------------------------- |
4 |
## $Log$ |
## $Log$ |
5 |
|
## Revision 1.12 2003/06/23 19:43:19 joko |
6 |
|
## minor cleanup |
7 |
|
## now using IPC::Session::NoShell |
8 |
|
## |
9 |
## Revision 1.11 2003/06/23 17:41:50 jonen |
## Revision 1.11 2003/06/23 17:41:50 jonen |
10 |
## + NEW - used IPC::Session instead of IPC::Run to get better results at linux |
## + NEW - used IPC::Session instead of IPC::Run to get better results at linux |
11 |
## |
## |
68 |
use Carp; |
use Carp; |
69 |
|
|
70 |
# NEW - 2003-06-23 |
# NEW - 2003-06-23 |
71 |
use IPC::Session; |
use IPC::Session::NoShell; |
72 |
|
|
73 |
|
|
74 |
# $now_string = strftime "%a %b %e %H:%M:%S %Y", localtime; |
# $now_string = strftime "%a %b %e %H:%M:%S %Y", localtime; |
85 |
return strftime("%Y-%m-%d", localtime); |
return strftime("%Y-%m-%d", localtime); |
86 |
} |
} |
87 |
|
|
88 |
|
sub RUNNING_IN_HELL () { $^O eq 'MSWin32' } |
89 |
|
|
90 |
|
|
91 |
sub get_executable { |
sub get_executable { |
92 |
my $cmd = shift; |
my $cmd = shift; |
93 |
# FIXME: detect type of program and run with proper application/interpreter |
# FIXME: detect type of program and run with proper application/interpreter |
119 |
my $cmd = shift; |
my $cmd = shift; |
120 |
my $caption = shift; |
my $caption = shift; |
121 |
my $options = shift; |
my $options = shift; |
|
#$cmd = 'perl ' . $cmd; |
|
122 |
|
|
123 |
#print Dumper($options); |
#print Dumper($options); |
124 |
|
|
125 |
# report - header |
# report - header |
126 |
my $sep = "-" x 60; |
my $sep = "-" x 60; |
127 |
print $sep, "\n"; |
print STDERR $sep, "\n"; |
128 |
#print " ", $cmd, "\n"; |
print STDERR " ", $cmd; |
129 |
#print " ", " $caption", "\n" if $caption; |
print STDERR " - ", $caption if $caption; |
130 |
print " ", $cmd; |
print STDERR "\n", $sep, "\n"; |
|
print " - ", $caption if $caption; |
|
|
print "\n"; |
|
|
print $sep, "\n"; |
|
131 |
|
|
132 |
# strip name of executable from full command string |
# strip name of executable from full command string |
133 |
$cmd =~ m/(.+?)\s/; |
$cmd =~ m/(.+?)\s/; |
156 |
-e $executable or die("$executable does not exist."); |
-e $executable or die("$executable does not exist."); |
157 |
#$basedir = "."; |
#$basedir = "."; |
158 |
#$basedir .= './'; |
#$basedir .= './'; |
159 |
|
$basedir = ""; |
160 |
} |
} |
161 |
$cmd = "$basedir$cmd"; |
$cmd = "$basedir$cmd"; |
162 |
|
|
178 |
#$cmd = "$application $cmd" if $application; |
#$cmd = "$application $cmd" if $application; |
179 |
#my $application = get_executable_wrapper($cmd); |
#my $application = get_executable_wrapper($cmd); |
180 |
|
|
181 |
print "run_cmd: IPC::Run: $cmd", "\n"; |
print STDERR "run_cmd: IPC::Session::NoShell: $cmd", "\n"; |
182 |
#run \@cmd, \$in, \$out, \$err, timeout( 10 ) or die "cat: $?"; |
#run \@cmd, \$in, \$out, \$err, timeout( 10 ) or die "cat: $?"; |
183 |
|
|
184 |
my @cmd = split(' ', $cmd); |
my @cmd = split(' ', $cmd); |
207 |
# to wait for init of process !?!) |
# to wait for init of process !?!) |
208 |
my $session_timeout = 2; |
my $session_timeout = 2; |
209 |
# set session name (default: cmd as string): |
# set session name (default: cmd as string): |
210 |
my $session_name = $cmd; |
my $session_command = $cmd; |
211 |
# create session: |
# create session: |
212 |
my $session = new IPC::Session($session_name, $session_timeout); |
my $session = new IPC::Session::NoShell($session_command, $session_timeout); |
213 |
# send 'cmd' to session: |
|
214 |
$session->send(\@cmd); |
# send 'cmd' to session - not required since complete command is sent via constructor above |
215 |
|
#$session->send(\@cmd); |
216 |
|
|
217 |
# optional switch case: |
# optional switch case: |
218 |
#for ($session->stdout()) { |
#for ($session->stdout()) { |
219 |
#} |
#} |
222 |
|
|
223 |
|
|
224 |
} else { |
} else { |
225 |
print "run_cmd: system('$cmd').", "\n"; |
print STDERR "run_cmd: system('$cmd').", "\n"; |
226 |
system($cmd); |
system($cmd); |
227 |
} |
} |
228 |
|
|
229 |
print "run_cmd: ready.", "\n"; |
print STDERR "run_cmd: ready.", "\n"; |
230 |
|
|
231 |
} |
} |
232 |
|
|
252 |
return ($bool ? 'ok' : 'failed'); |
return ($bool ? 'ok' : 'failed'); |
253 |
} |
} |
254 |
|
|
|
sub RUNNING_IN_HELL () { $^O eq 'MSWin32' } |
|
|
|
|
255 |
# create global unique identifers using Data::UUID |
# create global unique identifers using Data::UUID |
256 |
# if updating this code, please also modify Tangram::Storage::make_guid |
# if updating this code, please also modify Tangram::Storage::make_guid |
257 |
sub make_guid |
sub make_guid |
279 |
return $guid; |
return $guid; |
280 |
} |
} |
281 |
|
|
|
|
|
|
|
|
282 |
1; |
1; |
283 |
|
__END__ |