yacloud/tunasync-scripts
1
0
Fork 0
mirror of https://github.com/tuna/tunasync-scripts.git synced 2025-04-20 04:12:42 +00:00
Code Issues Packages Projects Releases Wiki Activity

Remove possible race condition; Uniq before compare.

Browse Source
This commit is contained in:
Miao Wang 2018-08-29 18:35:16 +08:00 committed by GitHub
parent 93692652dd
commit 2747dc1080
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
hackage.sh
View File

@ -5,7 +5,7 @@ set -o pipefail
function remove_broken() { function remove_broken() {
interval=$1 interval=$1
interval_file="/tmp/hackage_lastcheck" interval_file="${TUNASYNC_WORKING_DIR}/.tunasync_hackage_lastcheck"
now=`date +%s` now=`date +%s`
if [[ -f ${interval_file} ]]; then if [[ -f ${interval_file} ]]; then
@ -32,9 +32,9 @@ function must_download() {
src=$1 src=$1
dst=$2 dst=$2
while true; do while true; do
echo "downloading: $name" echo "downloading: $dst"
wget "$src" -O "$dst" &>/dev/null wget "$src" -O "$dst" &>/dev/null
tar -tzf package/$name >/dev/null || rm package/$name && break tar -tzf "$dst" >/dev/null || rm "$dst" && break
done done
return 0 return 0
} }
@ -55,10 +55,10 @@ function hackage_mirror() {
local tmp local tmp
tmp=(package/*) tmp=(package/*)
tmp=(${tmp[@]#package/}) tmp=(${tmp[@]#package/})
printf '%s\n' "${tmp[@]%.tar.gz}" > "${local_pklist}" printf '%s\n' "${tmp[@]%.tar.gz}" | sort | uniq > "${local_pklist}"
echo "building remote package list" echo "building remote package list"
tar -ztf index.tar.gz | (cut -d/ -f 1,2 2>/dev/null) | sed 's|/|-|' > $remote_pklist tar -ztf index.tar.gz | (cut -d/ -f 1,2 2>/dev/null) | sed 's|/|-|' | sort | uniq > "${remote_pklist}"
echo "building download list" echo "building download list"
# substract local list from remote list # substract local list from remote list
@ -78,17 +78,17 @@ function hackage_mirror() {
done done
name="$pk.tar.gz" name="$pk.tar.gz"
if [ ! -a package/$name ]; then if [ ! -e package/$name ]; then
must_download "${base_url}/package/$pk/$name" "package/$name" & must_download "${base_url}/package/$pk/$name" "package/$name" &
else else
echo "skip existed: $name" echo "skip existed: $name"
fi fi
done < <(comm <(sort $remote_pklist) <(sort $local_pklist) -23) done < <(comm "${remote_pklist}" "${local_pklist}" -23)
wait wait
# delete redundanty files # delete redundanty files
comm <(sort $remote_pklist) <(sort $local_pklist) -13 | while read pk; do comm "$remote_pklist" "$local_pklist" -13 | while read pk; do
if [[ $pk == "preferred-versions" ]]; then if [[ $pk == "preferred-versions" ]]; then
continue continue
fi fi