X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=cluster_tools%2Fgate_run_submit_cluster.sh;h=a74429a10f7525ac200e0d883bf23f39eec1807d;hb=266d6bcb4df9306d4c93cd0229cb59d7811d9825;hp=edd798bf62839fdbaccd39d28e828be2086d808e;hpb=b3d88d60218accc8ba078bc2d7fcc1e5e5befe59;p=clitk.git

diff --git a/cluster_tools/gate_run_submit_cluster.sh b/cluster_tools/gate_run_submit_cluster.sh
index edd798b..a74429a 100755
--- a/cluster_tools/gate_run_submit_cluster.sh
+++ b/cluster_tools/gate_run_submit_cluster.sh
@@ -52,7 +52,16 @@ then
     OUTPUTDIR=$(mktemp -d -p "${MACRODIR}" run.XXXX || error "can't create temp dir")
     ssh -i ${HOME}/.ssh/ccin2p3 linux1.dg.creatis.insa-lyon.fr mkdir -p "cc/$(basename ${OUTPUTDIR})"
 else
-    OUTPUTDIR=$(mktemp --tmpdir=${MACRODIR} -d run.XXXX || error "can't create temp dir")
+    unamestr=`uname`
+    if [[ "$unamestr" == 'Darwin' ]]; then
+        ## On OSX (Darwin), mktemp version is different from Linux version . We
+        ## need the absolute folder here
+        OUTPUTDIR=$(mktemp -d run.XXXX || error "can't create temp dir")
+        OUTPUTDIR=${MACRODIR}/${OUTPUTDIR}
+    else
+        OUTPUTDIR=$(mktemp --tmpdir=${MACRODIR} -d run.XXXX || error "can't create temp dir")
+    fi
+    echo $OUTPUTDIR
 fi
 test -d ${OUTPUTDIR} || error "can't locate output dir"
 RUNID=${OUTPUTDIR##*.}
@@ -104,14 +113,15 @@ while test $NJOBS -gt 0; do
     then
         PROJECTGROUP=creatis
         qsub -o "${OUTPUTDIR}" \
-	     -l sps=1 \
+             -e "${OUTPUTDIR}" \
+             -l sps=1 \
              -N "gate.${RUNID}" \
              -v "PARAM=\"${PARAM}\",INDEX=${NJOBS},INDEXMAX=${NJOBSMAX},OUTPUTDIR=${OUTPUTDIR},RELEASEDIR=${RELEASEDIR},MACROFILE=${MACROFILE},MACRODIR=${MACRODIR}" \
              "${JOBFILE}" || error "submission error"
     else
         qsub -N "gatejob.${RUNID}" -o "${OUTPUTDIR}" \
-	    -v "PARAM=${PARAM},INDEX=${NJOBS},INDEXMAX=${NJOBSMAX},OUTPUTDIR=${OUTPUTDIR},RELEASEDIR=${RELEASEDIR},MACROFILE=${MACROFILE},MACRODIR=${MACRODIR}" \
-	    "${JOBFILE}" || error "submission error"
+      -v "PARAM=${PARAM},INDEX=${NJOBS},INDEXMAX=${NJOBSMAX},OUTPUTDIR=${OUTPUTDIR},RELEASEDIR=${RELEASEDIR},MACROFILE=${MACROFILE},MACRODIR=${MACRODIR}" \
+      "${JOBFILE}" || error "submission error"
     fi
 
     let NJOBS--