Changeset 86 for trunk/oarutils

Timestamp:

Jun 1, 2012, 11:39:17 PM (13 years ago)

Author:

g7moreau

Message:

• job with comment -> solution: inside {}

File:

• trunk/oarutils/oar-parexec (modified) (4 diffs)

trunk/oarutils/oar-parexec

@@ -243 +243 @@
          };
 
-      $job_cmd =~ s/(\s+##.*)$//; # suppress comment
+      #$job_cmd =~ s/(\s+##.*)$//; # suppress comment
 
       # set job environment, run it and clean
@@ -260 +260 @@
          $fh->print("trap 'kill -$sig_checkpoint \$(jobs -p)' $sig_checkpoint\n");
          $fh->print("echo \$\$ > $job_pidfile\n");
-         $fh->print("$job_cmd $job_stdout $job_stderr \&\n");
+         $fh->print("{\n");
+         $fh->print("$job_cmd\n");
+         $fh->print("} $job_stdout $job_stderr \&\n");
          $fh->print("while [ \$(jobs -p | wc -l) -gt 0 ]\n");
          $fh->print("do\n");
@@ -268 +270 @@
          }
       else {
-         $fh->print("$job_cmd $job_stdout $job_stderr\n");
+         $fh->print("{\n");
+         $fh->print("$job_cmd\n");
+         $fh->print("} $job_stdout $job_stderr\n");
          }
       $fh->print("rm -f $job_nodefile\n") if $job_np > 1;
@@ -481 +485 @@
  - empty line
  - comment line begin with #
- - valid shell command with double # for meta comment
+ - valid shell command (can containt comment)
 
 Example where F<$HOME/test/subjob1.sh> is a shell script (executable).
 
- $HOME/test/subjob01.sh  ## name=subjob01
- $HOME/test/subjob02.sh  ## name=subjob02
- $HOME/test/subjob03.sh  ## name=subjob03
- $HOME/test/subjob04.sh  ## name=subjob04
+ $HOME/test/subjob01.sh  # name=subjob01
+ $HOME/test/subjob02.sh  # name=subjob02
+ $HOME/test/subjob03.sh  # name=subjob03
+ $HOME/test/subjob04.sh  # name=subjob04
  ...
- $HOME/test/subjob38.sh  ## name=subjob38
- $HOME/test/subjob39.sh  ## name=subjob39
- $HOME/test/subjob40.sh  ## name=subjob40
+ $HOME/test/subjob38.sh  # name=subjob38
+ $HOME/test/subjob39.sh  # name=subjob39
+ $HOME/test/subjob40.sh  # name=subjob40
 
 These jobs could be launch by: