From 73f4adc58ab430fd3a0edf43ea249c919f267d1d Mon Sep 17 00:00:00 2001 From: Mario Fetka Date: Fri, 1 Mar 2013 18:50:20 +0100 Subject: [PATCH] add torrent support via adia2 --- lib/builder-targets.sh | 4 ++-- lib/builder-utils.sh | 4 ++++ 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/lib/builder-targets.sh b/lib/builder-targets.sh index 746168c..2ff1360 100644 --- a/lib/builder-targets.sh +++ b/lib/builder-targets.sh @@ -338,11 +338,11 @@ EOF local file_list=${OUTPUT_DIR}/product-file-list.txt local file_sort_list=${OUTPUT_DIR}/product-file-sort-list.txt rm -f ${file_list} - for cfg_file in `find ${OPSI_REPOS_BASE_DIR} -name "${PN}-${VERSION}-${CREATOR_TAG}*.cfg" -print ` ; do + for cfg_file in `find ${OPSI_REPOS_BASE_DIR} -name "${PN}-*.cfg" -print ` ; do . ${cfg_file} printf "%08d;$cfg_file\n" $REV_RELEASE >> ${file_list} done - sort -n ${file_list} > ${file_sort_list} + sort -V ${file_list} > ${file_sort_list} # Delete the oldest files log_debug "base list for calculate purge:" diff --git a/lib/builder-utils.sh b/lib/builder-utils.sh index 700414b..1d66593 100644 --- a/lib/builder-utils.sh +++ b/lib/builder-utils.sh @@ -29,6 +29,10 @@ function retrieve_file() { fi elif [ "$downloader" = "plowdown" ]; then plowdown --max-retries=1 -o ${dst%/*} "$src" + elif [ "$downloader" = "aria2c" ]; then + #aria2c --seed-time=0 -d ${dst%/*} -o ${dst##*/} "$src" + aria2c --seed-time=0 --allow-overwrite=true -o ${dst##*/} "$src" + mv -f ${dst##*/} ${dst%/*} else fatal_error "Downloader not implemented: $downloader" fi