root/manjaro-tools
1
0
Fork 0
forked from mirrored-repos/manjaro-tools
Code Pull requests Activity

util-iso: simplify torrent code and fix display issue with webseed url

Browse source
This commit is contained in:
udeved 2016-07-12 22:50:08 +02:00
parent df796f592d
commit 7f68d03f84
1 changed files with 11 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

20
lib/util-iso.sh
View file

@ -594,15 +594,10 @@ sign_iso(){
} }
make_torrent(){ make_torrent(){
msg2 "Creating torrent ..." local fn=$(gen_iso_fn).torrent
local name=$(gen_iso_fn).torrent msg2 "Creating (%s) ..." "${fn}"
[[ -f ${iso_dir}/${name} ]] && rm ${iso_dir}/${name} [[ -f ${iso_dir}/${fn} ]] && rm ${iso_dir}/${fn}
if [[ "${edition}" == 'official' ]];then mktorrent ${mktorrent_args[*]} -o ${iso_dir}/${fn} ${iso_dir}
set_remote_project "${edition}"
local webseed_url="http://${remote_url}/projects/${remote_project}/${dist_release}/${profile}/${iso_file}"
mktorrent_args+=(-w ${webseed_url})
fi
mktorrent ${mktorrent_args[*]} -o ${iso_dir}/${name} ${iso_dir}
} }
compress_images(){ compress_images(){
@ -709,6 +704,13 @@ load_profile(){
prepare_dir "${iso_dir}" prepare_dir "${iso_dir}"
mktorrent_args=(-v -p -l ${piece_size} -a ${tracker_url}) mktorrent_args=(-v -p -l ${piece_size} -a ${tracker_url})
if [[ "${edition}" == 'official' ]];then
set_remote_project "${edition}"
local webseed_url url="http://${remote_url}/projects/${remote_project}"
webseed_url="${url}/${dist_release}/${profile}/${iso_file}"
mktorrent_args+=(-w ${webseed_url})
fi
} }
get_edition(){ get_edition(){