more grid script

[clitk.git] / grid / common.sh

diff --git a/grid/common.sh b/grid/common.sh
index ab6b527a8666f08b7a0137119f0f67f0da5db340..853cef92e407620b8972fb76b79c82af2da8dcc1 100644 (file)
--- a/grid/common.sh
+++ b/grid/common.sh
@@ -42,10 +42,12 @@ 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}"
+if file_exists "${destlfn}"; then
+       check_user "${destlfn} already exists. overwrite it?" || return 2
+       lcg-del -a "lfn:${destlfn}"
+fi
+echo "lets roll"
 lcg-cr -v -d ccsrm02.in2p3.fr -l "lfn:${destlfn}" "file:${sourcefile}" 
 }
 
@@ -53,7 +55,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/"