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

fix #41

Browse Source
This commit is contained in:
z4yx 2020-03-07 12:00:47 +08:00
parent e87a55da65
commit 7a210b59ae
2 changed files with 16 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
helpers/apt-download
View File

@ -10,6 +10,7 @@ fi
LOADED_APT_DOWNLOAD="yes" LOADED_APT_DOWNLOAD="yes"
MAX_RETRY=${MAX_RETRY:-"3"} MAX_RETRY=${MAX_RETRY:-"3"}
DOWNLOAD_TIMEOUT=${DOWNLOAD_TIMEOUT:-"1800"}
function apt-download-binary() { function apt-download-binary() {
local base_url=$1 local base_url=$1
@ -154,8 +155,9 @@ function apt-download-binary() {
for retry in `seq ${MAX_RETRY}`; do for retry in `seq ${MAX_RETRY}`; do
echo "downloading ${pkg_url} to ${dest_filename}" echo "downloading ${pkg_url} to ${dest_filename}"
if [[ -z ${APT_DRY_RUN:-} ]]; then if [[ -z ${APT_DRY_RUN:-} ]]; then
wget ${WGET_OPTIONS:-} -q -O ${dest_filename} ${pkg_url} && { timeout -s INT "$DOWNLOAD_TIMEOUT" wget ${WGET_OPTIONS:-} -q -O ${dest_filename} ${pkg_url} && {
echo "${pkg_checksum} ${dest_filename}" | ${checksum_cmd} -c - && downloaded=true # two space for md5sum/sha1sum/sha256sum check format # two space for md5sum/sha1sum/sha256sum check format
echo "${pkg_checksum} ${dest_filename}" | ${checksum_cmd} -c - && downloaded=true
} }
else else
downloaded=true downloaded=true

17
virtualbox.sh
View File

@ -8,6 +8,8 @@ _here=`dirname $(realpath $0)`
[[ -z "${LOADED_APT_DOWNLOAD}" ]] && { echo "failed to load apt-download"; exit 1; } [[ -z "${LOADED_APT_DOWNLOAD}" ]] && { echo "failed to load apt-download"; exit 1; }
MAX_RETRY=${MAX_RETRY:-"3"}
DOWNLOAD_TIMEOUT=${DOWNLOAD_TIMEOUT:-"1800"}
BASE_URL="http://download.virtualbox.org/virtualbox" BASE_URL="http://download.virtualbox.org/virtualbox"
BASE_PATH="${TUNASYNC_WORKING_DIR}" BASE_PATH="${TUNASYNC_WORKING_DIR}"
@ -63,13 +65,13 @@ echo "Debian and ubuntu finished"
# === download standalone packages ==== # === download standalone packages ====
timeout -s INT 300 wget ${WGET_OPTIONS:-} -q -O "${BASE_PATH}/LATEST.TXT" "${BASE_URL}/LATEST.TXT" timeout -s INT 30 wget ${WGET_OPTIONS:-} -q -O "${BASE_PATH}/LATEST.TXT" "${BASE_URL}/LATEST.TXT"
LATEST_VERSION=`cat "${BASE_PATH}/LATEST.TXT"` LATEST_VERSION=`cat "${BASE_PATH}/LATEST.TXT"`
LATEST_PATH="${BASE_PATH}/${LATEST_VERSION}" LATEST_PATH="${BASE_PATH}/${LATEST_VERSION}"
mkdir -p ${LATEST_PATH} mkdir -p ${LATEST_PATH}
timeout -s INT 300 wget ${WGET_OPTIONS:-} -q -O "${LATEST_PATH}/MD5SUMS" "${BASE_URL}/${LATEST_VERSION}/MD5SUMS" timeout -s INT 30 wget ${WGET_OPTIONS:-} -q -O "${LATEST_PATH}/MD5SUMS" "${BASE_URL}/${LATEST_VERSION}/MD5SUMS"
timeout -s INT 300 wget ${WGET_OPTIONS:-} -q -O "${LATEST_PATH}/SHA256SUMS" "${BASE_URL}/${LATEST_VERSION}/SHA256SUMS" timeout -s INT 30 wget ${WGET_OPTIONS:-} -q -O "${LATEST_PATH}/SHA256SUMS" "${BASE_URL}/${LATEST_VERSION}/SHA256SUMS"
while read line; do while read line; do
read -a tokens <<< $line read -a tokens <<< $line
@ -88,18 +90,23 @@ while read line; do
echo "Skipping ${filename}" echo "Skipping ${filename}"
} }
fi fi
while [[ $downloaded != true ]]; do for retry in `seq ${MAX_RETRY}`; do
rm ${dest_filename} || true rm ${dest_filename} || true
echo "downloading ${pkg_url} to ${dest_filename}" echo "downloading ${pkg_url} to ${dest_filename}"
if [[ -z ${DRY_RUN:-} ]]; then if [[ -z ${DRY_RUN:-} ]]; then
wget ${WGET_OPTIONS:-} -N -c -q -O ${dest_filename} ${pkg_url} && { timeout -s INT "$DOWNLOAD_TIMEOUT" wget ${WGET_OPTIONS:-} -N -c -q -O ${dest_filename} ${pkg_url} && {
# two space for md5sum/sha1sum/sha256sum check format # two space for md5sum/sha1sum/sha256sum check format
echo "${pkg_checksum} ${dest_filename}" | md5sum -c - && downloaded=true echo "${pkg_checksum} ${dest_filename}" | md5sum -c - && downloaded=true
} }
else else
downloaded=true downloaded=true
fi fi
[[ $downloaded == true ]] && break
done done
if [[ $downloaded == false ]];then
echo "failed to download ${pkg_url} to ${dest_filename}"
exit 1
fi
case $filename in case $filename in
*Win.exe) *Win.exe)