remove tmp qsub script in EXIT trap

SIMEXP · Jan 20, 2017 · 1bc6b8b · 1bc6b8b
1 parent 6ec39fc
commit 1bc6b8b
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 3 deletions.
diff --git a/container/psom_console.sh b/container/psom_console.sh
@@ -60,7 +60,8 @@ finish () {
   # Your cleanup code here
   kill ${LOOP_ID} > /dev/null 2>&1
   rm -r ${PSOM_FIFO_DIR} > /dev/null 2>&1
-#  rm -r /tmp/niak_worker_qsub.*
+  rm -r /tmp/psom_worker_qsub.*
+  ## Could add a qdel cmd here to clean process when console is not running
 }
 trap finish EXIT
 
@@ -72,7 +73,7 @@ host_exec_loop () {
        QSUB_OPT=(${line%SPLIT_LINE*})
        if [[ ${QSUB_OPT[0]} == 'qsub_options' ]]; then
          SINGULARITY=(${line#*SPLIT_LINE})
-         tmpfile=$(mktemp /tmp/niak_worker_qsub.XXXXXX)
+         tmpfile=$(mktemp /tmp/psom_worker_qsub.XXXXXX)
          echo '#!/bin/bash' > ${tmpfile}
          echo singularity  exec ${PSOM_SINGULARITY_OPTIONS} ${SINGULARITY[@]:1}  >> ${tmpfile}
          qsub ${QSUB_OPT[@]:1} ${tmpfile}

diff --git a/psom_gb_vars.m b/psom_gb_vars.m
@@ -74,7 +74,7 @@
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 
 % PSOM version
-gb_psom_version = '2.2.1'; % PSOM release number
+gb_psom_version = '2.2.2'; % PSOM release number
 
 % Is the environment Octave or Matlab ?
 if exist('OCTAVE_VERSION','builtin')