From 7ad904bd413f371c27e9fea8d8d6ecab5b207e6f Mon Sep 17 00:00:00 2001 From: Javi Fontan Date: Thu, 14 Jun 2012 12:29:50 +0200 Subject: [PATCH] feature #1303: added downloader to datastore fs/cp --- src/datastore_mad/remotes/fs/cp | 26 ++++++++++++++++++++++---- 1 file changed, 22 insertions(+), 4 deletions(-) diff --git a/src/datastore_mad/remotes/fs/cp b/src/datastore_mad/remotes/fs/cp index 81a6b07679..ecffd9ec83 100755 --- a/src/datastore_mad/remotes/fs/cp +++ b/src/datastore_mad/remotes/fs/cp @@ -39,7 +39,9 @@ source ${DRIVER_PATH}/../libfs.sh DRV_ACTION=$1 ID=$2 -XPATH="${DRIVER_PATH}/../xpath.rb -b $DRV_ACTION" +UTILS_PATH="${DRIVER_PATH}/.." + +XPATH="$UTILS_PATH/xpath.rb -b $DRV_ACTION" unset i XPATH_ELEMENTS @@ -49,26 +51,42 @@ done < <($XPATH /DS_DRIVER_ACTION_DATA/DATASTORE/BASE_PATH \ /DS_DRIVER_ACTION_DATA/DATASTORE/TEMPLATE/RESTRICTED_DIRS \ /DS_DRIVER_ACTION_DATA/DATASTORE/TEMPLATE/SAFE_DIRS \ /DS_DRIVER_ACTION_DATA/DATASTORE/TEMPLATE/UMASK \ - /DS_DRIVER_ACTION_DATA/IMAGE/PATH) + /DS_DRIVER_ACTION_DATA/IMAGE/PATH \ + /DS_DRIVER_ACTION_DATA/IMAGE/MD5 \ + /DS_DRIVER_ACTION_DATA/IMAGE/SHA1) BASE_PATH="${XPATH_ELEMENTS[0]}" RESTRICTED_DIRS="${XPATH_ELEMENTS[1]}" SAFE_DIRS="${XPATH_ELEMENTS[2]}" UMASK="${XPATH_ELEMENTS[3]}" SRC="${XPATH_ELEMENTS[4]}" +MD5="${XPATH_ELEMENTS[5]}" +SHA1="${XPATH_ELEMENTS[6]}" mkdir -p "$BASE_PATH" set_up_datastore "$BASE_PATH" "$RESTRICTED_DIRS" "$SAFE_DIRS" "$UMASK" DST=`generate_image_path` +HASHES="" + +if [ -n "$MD5"]; then + HASHES="$HASHES --md5 $MD5" +fi + +if [ -n "$SHA1"]; then + HASHES="$HASHES --sha1 $SHA1" +fi + +COPY_COMMAND="$UTILS_PATH/downloader.rb $HASHES $SRC $DST" + # ------------ Copy the image to the repository ------------- case $SRC in http://*) log "Downloading $SRC to the image repository" - exec_and_log "$WGET -O $DST $SRC" "Error downloading $SRC" + exec_and_log "$COPY_COMMAND" "Error downloading $SRC" ;; *) @@ -80,7 +98,7 @@ http://*) log "Copying local image $SRC to the image repository" - exec_and_log "cp -f $SRC $DST" "Error copying $SRC to $DST" + exec_and_log "$COPY_COMMAND" "Error copying $SRC to $DST" ;; esac