mem needs to be concatenated, not separated with ,

[uiuc_igb_scripts.git] / dqsub

diff --git a/dqsub b/dqsub
old mode 100644 (file)
new mode 100755 (executable)
index e0b9744..7257d5c
--- a/dqsub
+++ b/dqsub
@@ -10,7 +10,7 @@ use warnings;
 use strict;
 
 use Getopt::Long;
-use Pod::Usage;
+# use Pod::Usage;
 
 =head1 NAME
 
@@ -101,8 +101,8 @@ GetOptions(\%options,
            'dir=s',
            'debug|d+','help|h|?','man|m');
 
-pod2usage() if $options{help};
-pod2usage({verbose=>2}) if $options{man};
+# pod2usage() if $options{help};
+# pod2usage({verbose=>2}) if $options{man};
 
 $DEBUG = $options{debug};
 
@@ -121,7 +121,8 @@ if ($options{interactive} and @ARGV) {
     push @USAGE_ERRORS,"Don't provide commands when you're asking for an interactive shell";
 }
 
-pod2usage(join("\n",@USAGE_ERRORS)) if @USAGE_ERRORS;
+# pod2usage(join("\n",@USAGE_ERRORS)) if @USAGE_ERRORS;
+print STDERR join("\n",@USAGE_ERRORS) and exit 1 if @USAGE_ERRORS;
 
 # OK. Generate the options to qsub which we'll be using
 my @qsub_options = generate_qsub_options(\%options);
@@ -157,9 +158,13 @@ sub generate_qsub_options{
         $l[$#l] .= ':ppn='.$options->{ppn};
     }
     if ($options->{mem}) {
-        push @l,'mem=',$options->{mem};
+        push @l,'mem='.$options->{mem};
     }
     push @qo,'-l',join(',',@l) if @l;
+    if ($options->{interactive}) {
+        push @qo,'-I';
+    }
+    return @qo;
 }
 
 sub read_array_options{