--- nfo/perl/libs/shortcuts.pm	2003/06/23 20:58:31	1.13
+++ nfo/perl/libs/shortcuts.pm	2003/06/24 20:13:18	1.14
@@ -1,7 +1,11 @@
 ## ---------------------------------------------------------------------------
-##  $Id: shortcuts.pm,v 1.13 2003/06/23 20:58:31 joko Exp $
+##  $Id: shortcuts.pm,v 1.14 2003/06/24 20:13:18 joko Exp $
 ## ---------------------------------------------------------------------------
 ##  $Log: shortcuts.pm,v $
+##  Revision 1.14  2003/06/24 20:13:18  joko
+##  + sub findpatch
+##  + now using findpatch and Proc::Background for win32/perl
+##
 ##  Revision 1.13  2003/06/23 20:58:31  joko
 ##  restructured, hopefully makes Linux and Windows (and *BSD) more compatible...  what about IPC::Cmd???
 ##
@@ -67,12 +71,15 @@
 use Data::Dumper;
 use POSIX qw( strftime );
 #use IPC::Run qw( run timeout );
-use IPC::Run qw( start pump finish timeout run ) ;
+use IPC::Run qw( start pump finish timeout run timer ) ;
 use Carp;
 
 # NEW - 2003-06-23 for Linux (what about *BSD?)
 use IPC::Session;
 
+use File::Spec;
+use Proc::Background;
+
 
 # $now_string = strftime "%a %b %e %H:%M:%S %Y", localtime;
 # see "perldoc -f localtime"
@@ -119,7 +126,10 @@
   
     if (RUNNING_IN_HELL()) {
       # Required to adapt to IPC::Run on win32.
-      $wrapper = 'cmd.exe /C perl';
+      #$wrapper = 'cmd.exe /C perl';
+      #$wrapper = 'start perl';
+      $wrapper = 'perl';
+      #$wrapper = 'cmd.exe /C';
     } else {
       # NEW 2003-06-23 - needed if used with IPC::Session (at Linux)
       #  whats about Win32?
@@ -139,18 +149,19 @@
   my $caption = shift;
   my $options = shift;
   
-  #print Dumper($options);
+  #print STDOUT "run_cmd - options: ", Dumper($options), "\n";
   
   # report - header
   my $sep = "-" x 60;
-  print STDERR $sep, "\n";
-  print STDERR "  ", $cmd;
-  print STDERR " - ", $caption if $caption;
-  print STDERR "\n", $sep, "\n";
+  print STDOUT $sep, "\n";
+  print STDOUT "  ", $cmd;
+  print STDOUT " - ", $caption if $caption;
+  print STDOUT "\n", $sep, "\n";
   
   # strip name of executable from full command string
-  $cmd =~ m/(.+?)\s/;
+  $cmd =~ m/^(.+?)\s(.*)$/;
   my $executable = $1;
+  my $executable_args = $2;
   
 =pod
   # for unix: check if executable is in local directory, if so - prefix with './'
@@ -169,15 +180,22 @@
   if ($basedir) {
     -e "$basedir/$executable" or die("$basedir/$executable does not exist.");
     $basedir .= '/';
+    $cmd = "$basedir$cmd";
   } elsif ($use_path) {
-    $basedir = "";
+    #$basedir = "";
+    $basedir = findpath($executable);
+    #print "basedir: $basedir", "\n";
+    my $abspath = File::Spec->catfile($basedir, $executable);
+    #print STDOUT "PATH: ", $abspath, "\n";
+    -e $abspath or die("$abspath does not exist.");
+    $cmd = $abspath . ' ' . $executable_args;
   } else {
     -e $executable or die("$executable does not exist.");
     #$basedir = ".";
     #$basedir .= './';
     $basedir = "";
+    $cmd = "$basedir$cmd";
   }
-  $cmd = "$basedir$cmd";
 
   # V1 - backticks or qq{}
   #`$cmd`;
@@ -186,10 +204,10 @@
   # V2 - via 'system'
   #system($cmd);
 
-  if (not $use_path) {
+  #if (not $use_path) {
     my $application = get_executable($cmd);
     $cmd = "$application$cmd" if $application;
-  }
+  #}
 
   # V3 - using IPC (optional)
   if ($options->{async}) {
@@ -205,21 +223,39 @@
     if (RUNNING_IN_HELL()) {
     
       #my $in; my $out; my $err;
-      print STDERR "run_cmd: IPC::Run: $cmd", "\n";
+      print STDOUT "run_cmd: IPC::Run: $cmd", "\n";
+      
+      #print STDOUT "findpath: ", findpath('rap.pl'), "\n";
       
       # no success!
       #start \@cmd, timeout(0) or croak("run_cmd: IPC::Run could not start '$cmd'.");
       #
       # success on Win32, but seems broken at 'timeout' on linux:
-      run(\@cmd, timeout(4)) or croak("run_cmd: IPC::Run could not start '$cmd'.");
+      #run(\@cmd, timeout(3)) or croak("run_cmd: IPC::Run could not start '$cmd'.");
+      #start(\@cmd, timer(2)) or croak("run_cmd: IPC::Run could not start '$cmd'.");
+      #start(\@cmd, \undef) or croak("run_cmd: IPC::Run could not start '$cmd'.");
+      #start \@cmd or croak("run_cmd: IPC::Run could not start '$cmd'.");
+      #start(\@cmd, timeout(1)) or croak("run_cmd: IPC::Run could not start '$cmd'.");      
           
       # other tests ;)
       #$IPC::Run::Timer::timeout = 2000;
       #start $cmd or die("IPC::Run could not start '$cmd'.");
       
+      #my $in; my $out; my $t;
+      #my $harness = start( \@cmd, \$in, \$out, $t = timer( 5 ) ) ;
+      #my $harness = start( \@cmd ) ;
+      #$harness->pump_nb();
+      
+      #my $postfix = '2>&1 |';
+      #open PIPE, "$cmd $postfix" or die("run_cmd: could not run in background via open!");
+      
+      my $proc1 = Proc::Background->new(@cmd);
+      print "pid: ", $proc1->pid(), "\n";
+
+      
     } else {
 
-      print STDERR "run_cmd: IPC::Session: $cmd", "\n";
+      print STDOUT "run_cmd: IPC::Session: $cmd", "\n";
 
       # V3.2 - using IPC::Session
       #  success on Linux AND Win32 ??
@@ -246,11 +282,11 @@
     }
     
   } else {
-    print STDERR "run_cmd: system('$cmd').", "\n";
+    print STDOUT "run_cmd: system('$cmd').", "\n";
     system($cmd);
   }
   
-  print STDERR "run_cmd: ready.", "\n";
+  print STDOUT "run_cmd: ready.", "\n";
   
 }
 
@@ -303,5 +339,25 @@
     return $guid;
   }
 
+# [modified] from: http://www.mit.edu/afs/athena/contrib/watchmaker/src/pt/Configure
+sub findpath {
+    #local($path);
+    #local($arg) = shift;
+    my $arg = shift;
+    my $path;
+    #for my $dir (split(/:/,$ENV{'PATH'})) {
+    for my $dir (File::Spec->path()) {
+	#if (-x "$dir/$arg" && -f _) {
+        #print STDOUT "scanning: ", "$dir/$arg", "\n";
+	if (-e "$dir/$arg") {
+	    #$path = "$dir/$arg";
+	    #$path = "$dir/";
+	    $path = $dir;
+	    last;
+	} 
+    } 
+    $path;
+}
+
 1;
 __END__