Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Allow continue on download retries #185

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Allow continue on download retries #185

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 6 additions & 5 deletions scripts/sharedFuncs.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -183,6 +183,7 @@ function download_component() {
show_message "downloading $4 ..."
ariapkg=$(package_installed aria2c "summary")
curlpkg=$(package_installed curl "summary")
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I think we can opt out of curl, so remove any lines which use curl, such as this

wgetpkg=$(package_installed wget "summary")

if [ "$ariapkg" == "true" ];then
show_message "using aria2c to download $4"
Expand All @@ -192,12 +193,12 @@ function download_component() {
notify-send "Photoshop CC" "$4 download completed" -i "download"
fi

elif [ "$curlpkg" == "true" ];then
show_message "using curl to download $4"
curl $3 -o $1
else
elif [ "$wgetpkg" == "true" ];then
show_message "using wget to download $4"
wget --no-check-certificate "$3" -P "$CACHE_PATH"
wget --no-check-certificate "$3" --continue --tries=0 -P "$CACHE_PATH"
else
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

and in else block we can print error with sugestion to install aria/wget and retry

show_message "using curl to download $4"
curl $3 --retry 999 --retry-all-errors -C - -o $1

if [ $? -eq 0 ];then
notify-send "Photoshop CC" "$4 download completed" -i "download"
Expand Down