From: pgueth <pgueth@kingkong.grid.creatis.insa-lyon.fr>
Date: Fri, 4 Mar 2011 14:30:20 +0000 (+0100)
Subject: upload_workflow script works
X-Git-Tag: v1.4.0~187
X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=commitdiff_plain;h=2ed0d337580044c160e15863df5dc6e27f7f70e2;p=clitk.git

upload_workflow script works
---

diff --git a/grid/common.sh b/grid/common.sh
index ab6b527..66203b6 100644
--- a/grid/common.sh
+++ b/grid/common.sh
@@ -42,10 +42,11 @@ sourcefile=${1:?"provide source file"}
 destlfn=${2:?"provide destination file lfn"}
 sourcefile="$(readlink -f "${sourcefile}")" # convert to absolute path
 test -f "${sourcefile}" || error "can't find ${sourcefile}"
-file_exists ${destlfn} && ( \
-	check_user "${destlfn} already exists. overwrite it?" || return 2 && \
-	lcg-del -a "lfn:${destlfn}" || error "failed to delete ${destlfn}" \
-) && \
+echo "uploading ${sourcefile} to ${destlfn}"
+file_exists "${destlfn}" \
+	&& check_user "${destlfn} already exists. overwrite it?" \
+	&& lcg-del -a "lfn:${destlfn}" \
+	|| return 2
 lcg-cr -v -d ccsrm02.in2p3.fr -l "lfn:${destlfn}" "file:${sourcefile}" 
 }
 
@@ -53,7 +54,7 @@ lcg-cr -v -d ccsrm02.in2p3.fr -l "lfn:${destlfn}" "file:${sourcefile}"
 # common path used
 lfnbase="/grid/biomed/creatis/fgate/"
 lfnrelease="${lfnbase}releases/"
-lfnworkflow="${lfnbase}"
+lfnworkflow="${lfnbase}workflow/"
 lfngasw="${lfnbase}gasw/"
 lfnscript="${lfnbase}bin/"