mirror of
https://github.com/LibreELEC/LibreELEC.tv.git
synced 2025-07-28 13:16:41 +00:00
build: replace wget with curl for fetching archives
Signed-off-by: Ian Leonard <antonlacon@gmail.com>
This commit is contained in:
parent
a7d9b7fc1c
commit
95e2a94898
@ -21,21 +21,21 @@ build_msg "CLR_GET" "GET" "${1} (archive)" "indent"
|
|||||||
pkg_lock_status "GETPKG" "${PKG_NAME}" "unpack" "downloading package..."
|
pkg_lock_status "GETPKG" "${PKG_NAME}" "unpack" "downloading package..."
|
||||||
|
|
||||||
PACKAGE_MIRROR="${DISTRO_MIRROR}/${PKG_NAME}/${PKG_SOURCE_NAME}"
|
PACKAGE_MIRROR="${DISTRO_MIRROR}/${PKG_NAME}/${PKG_SOURCE_NAME}"
|
||||||
[ "${VERBOSE}" != "yes" ] && WGET_OPT=-q
|
|
||||||
WGET_CMD="wget --output-file=- --timeout=30 --tries=3 --no-check-certificate -c ${WGET_OPT} --progress=bar:force --show-progress -O ${PACKAGE}"
|
[ "${VERBOSE}" != "yes" ] && GET_OPT="--silent --show-error"
|
||||||
|
GET_CMD="curl ${GET_OPT} --connect-timeout 30 --retry 3 --continue-at - --location --max-redirs 5 --output ${PACKAGE}"
|
||||||
|
|
||||||
# unset LD_LIBRARY_PATH to stop wget from using toolchain/lib and loading libssl.so/libcrypto.so instead of host libraries
|
# unset LD_LIBRARY_PATH to stop wget from using toolchain/lib and loading libssl.so/libcrypto.so instead of host libraries
|
||||||
unset LD_LIBRARY_PATH
|
unset LD_LIBRARY_PATH
|
||||||
|
|
||||||
rm -f "${STAMP_URL}" "${STAMP_SHA}"
|
rm -f "${STAMP_URL}" "${STAMP_SHA}"
|
||||||
|
|
||||||
NBWGET=10
|
NBGET=10
|
||||||
NBCHKS=2
|
NBCHKS=2
|
||||||
while [ ${NBWGET} -gt 0 -a ${NBCHKS} -gt 0 ]; do
|
while [ ${NBGET} -gt 0 -a ${NBCHKS} -gt 0 ]; do
|
||||||
for url in "${PKG_URL}" "${PACKAGE_MIRROR}"; do
|
for url in "${PKG_URL}" "${PACKAGE_MIRROR}"; do
|
||||||
rm -f "${PACKAGE}"
|
rm -f "${PACKAGE}"
|
||||||
[[ "${url}" =~ ^[fF][tT][pP]:* ]] && WGET_FTP=--passive-ftp || WGET_FTP=
|
if ${GET_CMD} "${url}"; then
|
||||||
if ${WGET_CMD} ${WGET_FTP} "${url}"; then
|
|
||||||
CALC_SHA256=$(sha256sum "${PACKAGE}" | cut -d" " -f1)
|
CALC_SHA256=$(sha256sum "${PACKAGE}" | cut -d" " -f1)
|
||||||
|
|
||||||
[ -z "${PKG_SHA256}" -o "${PKG_SHA256}" = "${CALC_SHA256}" ] && break 2
|
[ -z "${PKG_SHA256}" -o "${PKG_SHA256}" = "${CALC_SHA256}" ] && break 2
|
||||||
@ -49,10 +49,10 @@ while [ ${NBWGET} -gt 0 -a ${NBCHKS} -gt 0 ]; do
|
|||||||
fi
|
fi
|
||||||
fi
|
fi
|
||||||
done
|
done
|
||||||
NBWGET=$((NBWGET - 1))
|
NBGET=$((NBGET - 1))
|
||||||
done
|
done
|
||||||
|
|
||||||
if [ ${NBWGET} -eq 0 -o ${NBCHKS} -eq 0 ]; then
|
if [ ${NBGET} -eq 0 -o ${NBCHKS} -eq 0 ]; then
|
||||||
die "\nCannot get ${1} sources : ${PKG_URL}\nTry later!"
|
die "\nCannot get ${1} sources : ${PKG_URL}\nTry later!"
|
||||||
else
|
else
|
||||||
build_msg "CLR_INFO" "INFO" "Calculated checksum: ${CALC_SHA256}"
|
build_msg "CLR_INFO" "INFO" "Calculated checksum: ${CALC_SHA256}"
|
||||||
|
Loading…
x
Reference in New Issue
Block a user