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

Add support for Wget2 #619

Merged
merged 7 commits into from
May 4, 2024
Merged

Add support for Wget2 #619

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
4654a27
Added support for Wget2
Apr 26, 2024
169d35e
'command' is unnecessary here
Apr 29, 2024
692122d
Removed --progress=dot as it isn't supported by wget2
May 1, 2024
969f178
Added --force-progress to hopefully solve zenity progress bar; also s…
May 2, 2024
13dcb67
Merge branch 'rockerbacon:master' into master
swjzielinski May 4, 2024
d8b0449
implemented new progress_bar function for wget2
May 4, 2024
a4a47d8
now also checks for wget2
May 4, 2024
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
2 changes: 1 addition & 1 deletion step/check_dependencies.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ if [ -z "$(command -v 7z)" ]; then
missing_deps+=(7z)
fi

if [ -z "$(command -v curl)" ] && [ -z "$(command -v wget)" ]; then
if [ -z "$(command -v curl)" ] && [ -z "$(command -v wget)" ] && [ -z "$(command -v wget2)" ]; then
missing_deps+=("curl or wget")
fi

Expand Down
8 changes: 8 additions & 0 deletions utils/download.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,6 +33,9 @@ progress_bar() {
# don't have a name e.g. https://example.com/.
if [ -n "$DOWNLOAD_BACKEND" ]; then
download_backend="$DOWNLOAD_BACKEND"
elif command -v wget2 >& /dev/null; then
log_info "using wget2 backend"
download_backend="wget2"
elif command -v wget >& /dev/null; then
log_info "using wget backend"
download_backend="wget"
Expand All @@ -51,6 +54,11 @@ progress_text="Downloading '${out_file##*/}'"
log_info "downloading '$url' to '$out_file'"

case "$download_backend" in
"wget2")
wget2 "$url" --no-verbose --force-progress -O "$out_file" 2>&1 \
| progress_bar "$progress_text"
;;

"wget")
wget "$url" --progress=dot --no-verbose --show-progress -O "$out_file" 2>&1 \
| progress_bar "$progress_text"
Expand Down
Loading