more robust behavior of qsub-wrapper.pl

git-svn-id: https://mosesdecoder.svn.sourceforge.net/svnroot/mosesdecoder/trunk@3781 1f5c12ca-751b-0410-a591-d2e778427230

1 files changed, 8 insertions, 6 deletions

diff --git a/scripts/generic/qsub-wrapper.pl b/scripts/generic/qsub-wrapper.pl
index 72e7f0c6e..2c90b73d7 100755
--- a/scripts/generic/qsub-wrapper.pl
+++ b/scripts/generic/qsub-wrapper.pl
@@ -26,8 +26,8 @@ my $dbg="";
 my $version="";
 my $qsubname="WR$$";
 my $cmd="";
-my $cmdout="";
-my $cmderr="";
+my $cmdout=undef;
+my $cmderr=undef;
 my $parameters="";
 my $old_sge = 0; # assume grid engine < 6.0
 
@@ -77,8 +77,10 @@ sub usage(){
 #printparameters
 sub print_parameters(){
   print STDERR "command: $cmd\n";
-  print STDERR "file for stdout: $cmdout\n";
-  print STDERR "file for stderr: $cmderr\n";
+  if (defined($cmdout)){ print STDERR "file for stdout: $cmdout\n"; }
+  else { print STDERR "file for stdout is not defined, stdout is discarded\n"; }
+  if (defined($cmderr)){ print STDERR "file for stdout: $cmderr\n"; }
+  else { print STDERR "file for stderr is not defined, stderr is discarded\n"; }
   print STDERR "Qsub name: $qsubname\n";
   print STDERR "Queue parameters: $queueparameters\n";
   print STDERR "parameters directly passed to cmd: $parameters\n";
@@ -136,7 +138,7 @@ preparing_script();
 
 my $maysync = $old_sge ? "" : "-sync y";
 
-# submit the main job with the parameter "-b yes"
+# create the qsubcmd to submit to the queue with the parameter "-b yes"
 my $qsubcmd="qsub $queueparameters $maysync -V -o $qsubout -e $qsuberr -N $qsubname -b yes $jobscript > $jobscript.log 2>&1";
 
 #run the qsubcmd 
@@ -215,7 +217,7 @@ sub kill_all_and_quit(){
 sub remove_temporary_files(){
   #removing temporary files
 
-  unlink("${jobscript}.csh");
+  unlink("${jobscript}");
   unlink("${jobscript}.log");
   unlink("$qsubout");
   unlink("$qsuberr");