zawz/zpkg
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

fix: use curl instead of wget

Browse source
This commit is contained in:
zawz 2024-06-19 10:58:41 +02:00
parent 56e81efab3
commit 915b3f27c0
2 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
src/fetch.sh
View file

@ -5,7 +5,7 @@ fetch_package()
{ {
out="$2" out="$2"
[ -z "$out" ] && out="$1.tar.$extension" [ -z "$out" ] && out="$1.tar.$extension"
wget "$HTTP_ADDRESS/$1.tar.$extension" -q --show-progress -O "$out" 2>&1 curl --progress-bar "$HTTP_ADDRESS/$1.tar.$extension" -o "$out" 2>&1
} }
# $1 = prefix # $1 = prefix
@ -14,7 +14,7 @@ fetch_pkglist()
( (
cd "$PKG_PATH" || exit $? cd "$PKG_PATH" || exit $?
$1 mv pkglist pkglist_bak 2>/dev/null $1 mv pkglist pkglist_bak 2>/dev/null
if ! $1 wget "$HTTP_ADDRESS/pkglist" -q --show-progress -O pkglist 2>&1 if ! $1 curl --progress-bar "$HTTP_ADDRESS/pkglist" -o pkglist 2>&1
then then
echo "Couldn't fetch server data" >&2 echo "Couldn't fetch server data" >&2
$1 mv pkglist_bak pkglist 2>/dev/null $1 mv pkglist_bak pkglist 2>/dev/null

2
src/operation.sh
View file

@ -56,7 +56,7 @@ upgrade_package()
hook upgrade pre "$1" $2 hook upgrade pre "$1" $2
remove_files "$1" $2 remove_files "$1" $2
gen_metadata . | $2 tee "$PKG_PATH/$1.dat" >/dev/null gen_metadata "$1.tar.$extension" | $2 tee "$PKG_PATH/$1.dat" >/dev/null
install_files "$1" $2 install_files "$1" $2
hook upgrade post "$1" $2 hook upgrade post "$1" $2
) )