Merge pull request #36 from zenotech/develop

update to exit code handling
zenotech · Jan 18, 2018 · aa4f837 · aa4f837
2 parents 7da7dbf + 9ab07fd
commit aa4f837
Show file tree

Hide file tree

Showing 4 changed files with 13 additions and 8 deletions.
diff --git a/mycluster/templates/lsf.jinja b/mycluster/templates/lsf.jinja
@@ -73,7 +73,8 @@ echo -e "\nnumtasks={{num_tasks}}, numnodes={{num_nodes}}, tasks_per_node={{tpn}
 echo -e "\nExecuting command:\n==================\n{{my_script}}\n"
 
 # Run user script
-exitcode=. {{my_script}}
+. {{my_script}}
+exitcode=$?
 
 # Report on completion
 echo -e "\nJob Complete:\n==================\n"
@@ -89,5 +90,5 @@ if [ "$MYCLUSTER_APP_DATA" ]; then
 fi
 {% endif %}
 
-echo -e "Complete========\n"
+echo -e "Complete with exit code $exitcode========\n"
 exit $exitcode
diff --git a/mycluster/templates/pbs.jinja b/mycluster/templates/pbs.jinja
@@ -70,7 +70,8 @@ echo -e "\nnumtasks={{num_tasks}}, numnodes={{num_nodes}}, tasks_per_node={{tpn}
 echo -e "\nExecuting command:\n==================\n{{my_script}}\n"
 
 # Run user script
-exitcode=. {{my_script}}
+. {{my_script}}
+exitcode=$?
 
 # Report on completion
 echo -e "\nJob Complete:\n==================\n"
@@ -84,5 +85,5 @@ echo -e "\nJob Complete:\n==================\n"
         mycluster --jobid $PBS_JOBID --appdata=$MYCLUSTER_APP_DATA
     fi
 {% endif %}
-echo -e "Complete========\n"
+echo -e "Complete with exit code $exitcode========\n"
 exit $exitcode
diff --git a/mycluster/templates/sge.jinja b/mycluster/templates/sge.jinja
@@ -69,7 +69,8 @@ echo -e "\nnumtasks={{num_tasks}}, numnodes={{num_nodes}}, tasks_per_node={{tpn}
 echo -e "\nExecuting command:\n==================\n{{my_script}}\n"
 
 # Run user script
-exitcode=. {{my_script}}
+. {{my_script}}
+exitcode=$?
 
 # Report on completion
 echo -e "\nJob Complete:\n==================\n"
@@ -83,6 +84,7 @@ echo -e "\nJob Complete:\n==================\n"
         mycluster --jobid $JOBID --appdata=$MYCLUSTER_APP_DATA
     fi
 {% endif %}
-echo -e "Complete========\n"
+
+echo -e "Complete with exit code $exitcode========\n"
 
 exit $exitcode
diff --git a/mycluster/templates/slurm.jinja b/mycluster/templates/slurm.jinja
@@ -87,7 +87,8 @@ echo -e "\nnumtasks={{num_tasks}}, numnodes={{num_nodes}}, tasks_per_node={{tpn}
 echo -e "\nExecuting command:\n==================\n{{my_script}}\n"
 
 # Run user script
-exitcode=. {{my_script}}
+. {{my_script}}
+exitcode=$?
 
 # Report on completion
 echo -e "\nJob Complete:\n==================\n"
@@ -103,5 +104,5 @@ if [ "$MYCLUSTER_APP_DATA" ]; then
 fi
 {% endif %}
 
-echo -e "Complete========\n"
+echo -e "Complete with exit code $exitcode========\n"
 exit $exitcode