From: David Sarrut Date: Thu, 2 Aug 2018 06:01:56 +0000 (+0200) Subject: Merge branch 'master' of git.creatis.insa-lyon.fr:clitk X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=commitdiff_plain;ds=sidebyside;h=60b0c152dc3a8df68ddd4c8e88bdd5492dd6916b;hp=-c;p=clitk.git Merge branch 'master' of git.creatis.insa-lyon.fr:clitk --- 60b0c152dc3a8df68ddd4c8e88bdd5492dd6916b diff --combined cluster_tools/gate_run_submit_cluster.sh index a99e899,ebb0917..6e4b328 --- a/cluster_tools/gate_run_submit_cluster.sh +++ b/cluster_tools/gate_run_submit_cluster.sh @@@ -50,7 -50,6 +50,6 @@@ test -f ${MACRODIR}/${MACROFILE} || err if test "$(dnsdomainname)" = "in2p3.fr" 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 unamestr=`uname` if [[ "$unamestr" == 'Darwin' ]]; then @@@ -97,7 -96,6 +96,7 @@@ test -z "${PARAM}" || echo "param = ${P # Copy macros files (for log) mkdir ${OUTPUTDIR}/mac cp ${MACROFILE} ${OUTPUTDIR}/mac +cp mac/* ${OUTPUTDIR}/mac/ files=`grep "control/execute" ${MACROFILE} | cut -d " " -f 2` for i in $files do