@@ -35,8 +35,8 @@ channel_sync() {
35
35
# get meta-data
36
36
export remote_url=$baseurl
37
37
export local_dir=$tmpdir
38
- enable_mtime=true fail_to_exit=false download <<< " $(echo digests.txz meta.txz meta.conf meta.pkg packagesite.pkg data.pkg data.txz | tr ' ' '\n')"
39
- enable_mtime=true fail_to_exit=true download <<< " $(echo meta packagesite.txz | tr ' ' '\n')"
38
+ enable_mtime=true fail_to_exit=false download <<< " $(echo digests.txz meta.txz meta.conf meta.pkg packagesite.txz packagesite.tzst data.pkg data.txz data.tzst | tr ' ' '\n')"
39
+ enable_mtime=true fail_to_exit=true download <<< " $(echo meta packagesite.pkg | tr ' ' '\n')"
40
40
41
41
if [[ $? -ne 0 ]]; then
42
42
echo " [FATAL] download meta-data failed."
@@ -49,11 +49,15 @@ channel_sync() {
49
49
enable_mtime=true fail_to_exit=false download <<< " $(echo Latest/{pkg-devel.pkg,pkg.pkg,pkg.pkg.sig} | tr ' ' '\n')"
50
50
51
51
# get packages
52
- tar -C $tmpdir -xJf $tmpdir /packagesite.txz packagesite.yaml
52
+ tar -C $tmpdir -xJf $tmpdir /packagesite.pkg packagesite.yaml
53
53
if [[ $? -ne 0 ]]; then
54
- echo ' [FATAL] unzip packagesite.txz failed.'
55
- EXIT_CODE=$(( EXIT_CODE + 1 ))
56
- return 1
54
+ echo ' [WARN] xz failed, trying zstd...'
55
+ tar -C $tmpdir --zstd -xf $tmpdir /packagesite.pkg packagesite.yaml
56
+ if [[ $? -ne 0 ]]; then
57
+ echo ' [FATAL] zstd packagesite.pkg failed.'
58
+ EXIT_CODE=$(( EXIT_CODE + 1 ))
59
+ return 1
60
+ fi
57
61
fi
58
62
jq -r ' "\(.sum) \(.repopath)"' $tmpdir /packagesite.yaml | sort -k2 > $meta
59
63
rm -f $tmpdir /packagesite.yaml
@@ -89,7 +93,7 @@ while read platform; do
89
93
channels=$( $CURL_WRAP -sSL $FBSD_PKG_UPSTREAM /$platform | grep -oP ' latest|quarterly|base_[a-z0-9_]+|kmods_[a-z0-9_]+' | sort -t : -rnk 2 | uniq)
90
94
echo $channels
91
95
for channel in $channels ; do
92
- if $CURL_WRAP -sLIf -o /dev/null $FBSD_PKG_UPSTREAM /$platform /$channel /packagesite.txz ; then
96
+ if $CURL_WRAP -sLIf -o /dev/null $FBSD_PKG_UPSTREAM /$platform /$channel /packagesite.pkg ; then
93
97
channel_sync $FBSD_PKG_UPSTREAM /$platform /$channel $TO /$platform /$channel
94
98
fi
95
99
done
0 commit comments