43 lines
1.6 KiB
Diff
43 lines
1.6 KiB
Diff
|
From f93ac80a0b3e9017bf2c374b72126908a7f5cbde Mon Sep 17 00:00:00 2001
|
||
|
|
From: David Tardon <dtardon@redhat.com>
|
||
|
|
Date: Mon, 8 Aug 2022 13:42:51 +0200
|
||
|
|
Subject: [PATCH] refactor(url-lib): write curl output directly to file
|
||
|
|
|
||
|
|
The redirection to stdout was originally added to workaround
|
||
|
|
https://bugzilla.redhat.com/show_bug.cgi?id=989133 (curl would create no
|
||
|
|
file if the source was empty), but I don't see that problem with current
|
||
|
|
curl.
|
||
|
|
|
||
|
|
A nice side-effect of this change is that curl shows download progress.
|
||
|
|
|
||
|
|
(cherry picked from commit 1343d21d8c0d1f7239e27165e9c7633b504f777f)
|
||
|
|
|
||
|
|
Resolves: #2112475
|
||
|
|
---
|
||
|
|
modules.d/45url-lib/url-lib.sh | 4 ++--
|
||
|
|
1 file changed, 2 insertions(+), 2 deletions(-)
|
||
|
|
|
||
|
|
diff --git a/modules.d/45url-lib/url-lib.sh b/modules.d/45url-lib/url-lib.sh
|
||
|
|
index e88fbc14..b009fd09 100755
|
||
|
|
--- a/modules.d/45url-lib/url-lib.sh
|
||
|
|
+++ b/modules.d/45url-lib/url-lib.sh
|
||
|
|
@@ -67,7 +67,7 @@ curl_fetch_url() {
|
||
|
|
echo "$url" > /proc/self/fd/0
|
||
|
|
if [ -n "$outloc" ]; then
|
||
|
|
# shellcheck disable=SC2086
|
||
|
|
- curl $curl_args --output - -- "$url" > "$outloc" || return $?
|
||
|
|
+ curl $curl_args --output "$outloc" -- "$url" || return $?
|
||
|
|
else
|
||
|
|
local outdir
|
||
|
|
outdir="$(mkuniqdir /tmp curl_fetch_url)"
|
||
|
|
@@ -101,7 +101,7 @@ ctorrent_fetch_url() {
|
||
|
|
echo "$url" > /proc/self/fd/0
|
||
|
|
if [ -n "$outloc" ]; then
|
||
|
|
# shellcheck disable=SC2086
|
||
|
|
- curl $curl_args --output - -- "$url" > "$torrent_outloc" || return $?
|
||
|
|
+ curl $curl_args --output "$torrent_outloc" -- "$url" || return $?
|
||
|
|
else
|
||
|
|
local outdir
|
||
|
|
outdir="$(mkuniqdir /tmp torrent_fetch_url)"
|
||
|
|
|