be-gay-do-crimes
/
photoshopCClinux
mirror of https://github.com/Gictorbit/photoshopCClinux
1
0
Fork 0
Code Issues Releases Wiki Activity

Improve download_component to allow for resuming failed downloads

This commit is contained in:
sebas 2023-04-13 11:09:01 +02:00
parent 5f8f0adcdd
commit 192353f99b
1 changed files with 19 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
scripts/sharedFuncs.sh
View File

@ -166,13 +166,13 @@ function export_var() {
#parameters is [PATH] [CheckSum] [URL] [FILE NAME] #parameters is [PATH] [CheckSum] [URL] [FILE NAME]
function download_component() { function download_component() {
local tout=0 local tout=0
while true;do while true; do
if [ $tout -ge 3 ];then if [ $tout -ge 3 ]; then
error "sorry something went wrong during download $4" error "sorry something went wrong during download $4"
fi fi
if [ -f $1 ];then if [ -f $1 ]; then
local FILE_ID=$(md5sum $1 | cut -d" " -f1) local FILE_ID=$(md5sum $1 | cut -d" " -f1)
if [ "$FILE_ID" == $2 ];then if [ "$FILE_ID" == $2 ]; then
show_message "\033[1;36m$4\e[0m detected" show_message "\033[1;36m$4\e[0m detected"
return 0 return 0
else else
@ -184,22 +184,32 @@ function download_component() {
ariapkg=$(package_installed aria2c "summary") ariapkg=$(package_installed aria2c "summary")
curlpkg=$(package_installed curl "summary") curlpkg=$(package_installed curl "summary")
if [ "$ariapkg" == "true" ];then if [ "$ariapkg" == "true" ]; then
show_message "using aria2c to download $4" show_message "using aria2c to download $4"
aria2c -c -x 8 -d "$CACHE_PATH" -o $4 $3 aria2c -c -x 8 -d "$CACHE_PATH" -o $4 $3
if [ $? -eq 0 ];then if [ $? -eq 0 ]; then
notify-send "Photoshop CC" "$4 download completed" -i "download" notify-send "Photoshop CC" "$4 download completed" -i "download"
fi fi
elif [ "$curlpkg" == "true" ];then elif [ "$curlpkg" == "true" ]; then
show_message "using curl to download $4" show_message "using curl to download $4"
curl $3 -o $1 while true; do
curl -C - --progress-bar -o $1 $3
if [ $? -eq 0 ]; then
notify-send "Photoshop CC" "$4 download completed" -i "download"
break
else
show_message "Download failed, waiting before retrying..."
sleep $((tout*5))
((tout++))
fi
done
else else
show_message "using wget to download $4" show_message "using wget to download $4"
wget --no-check-certificate "$3" -P "$CACHE_PATH" wget --no-check-certificate "$3" -P "$CACHE_PATH"
if [ $? -eq 0 ];then if [ $? -eq 0 ]; then
notify-send "Photoshop CC" "$4 download completed" -i "download" notify-send "Photoshop CC" "$4 download completed" -i "download"
fi fi
fi fi