X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=cluster_tools%2Fgate_job_ccin2p3.job;h=f07f9c2efec8d8b69ab0df6dd28584fcdc93f496;hb=83eb68efc39ad8fcb5e4e684afafcfc86b829c96;hp=016b2368de00972fc3348668de2b7d56489b048d;hpb=4a4934ca65d9d47729f2c7179f94b79de2f889bc;p=clitk.git

diff --git a/cluster_tools/gate_job_ccin2p3.job b/cluster_tools/gate_job_ccin2p3.job
index 016b236..f07f9c2 100644
--- a/cluster_tools/gate_job_ccin2p3.job
+++ b/cluster_tools/gate_job_ccin2p3.job
@@ -17,13 +17,12 @@
 
 function transferJobData {
     echo "Copying data back"
-    #ssh -i ${HOME}/.ssh/ccin2p3 linux1.dg.creatis.insa-lyon.fr "mkdir cc/$(basename ${OUTPUTDIR})/output.${JOB_ID%%.*}"
-    #rsync -av --remove-source-files -e "ssh -i ${HOME}/.ssh/ccin2p3" output/ "linux1.dg.creatis.insa-lyon.fr:./cc/$(basename ${OUTPUTDIR})/output.${JOB_ID%%.*}"
     pwd
     echo ${OUTPUTDIR}
     mkdir "${OUTPUTDIR}/output.${JOB_ID%%.*}"
     rsync -av --remove-source-files output/ "${OUTPUTDIR}/output.${JOB_ID%%.*}"
     echo "Cleanup"
+    unlink "${LOCALMACRODIR}"/data
     rm -r ${LOCALMACRODIR}
 }
 
@@ -76,9 +75,11 @@ test -d "${MACRODIR}" && test -d "${MACRODIR}/mac" || error "invalid macro"
 
 echo "Copying inputs"
 LOCALMACRODIR=$(mktemp -d)
-trap "wait ; transferJobData ; exit 1" 137 138 152 153
+trap "wait ; transferJobData ; exit 1" 1 2 3 15
 cd ${LOCALMACRODIR}
-cp -r -L "${MACRODIR}"/{data,mac} .
+cp -r -L "${MACRODIR}"/mac .
+ln -s "${MACRODIR}"/data ./data
+#cp -r -L "${MACRODIR}"/{data,mac} .
 mkdir output
 
 # Enforce one thread