Skip to content

Commit

Permalink
fix(url-lib): fix passing args
Browse files Browse the repository at this point in the history
Fixes: 8e84fa7 ("fix(url-lib): shellcheck for modules.d/45url-lib")

Behaviour introduced by that commit made the following to be run:
curl "--globoff --location --retry 3 --fail --show-error" http:https://192.168.1.173:8000/test.ks
instead of:
curl --globoff --location --retry 3 --fail --show-error http:https://192.168.1.173:8000/test.ks

This broke downloading kickstart file in anaconda-dracut.
  • Loading branch information
mikhailnov authored and haraldh committed May 14, 2021
1 parent 61f4564 commit 5f6be51
Showing 1 changed file with 10 additions and 5 deletions.
15 changes: 10 additions & 5 deletions modules.d/45url-lib/url-lib.sh
Original file line number Diff line number Diff line change
Expand Up @@ -66,13 +66,15 @@ curl_fetch_url() {
local url="$1" outloc="$2"
echo "$url" > /proc/self/fd/0
if [ -n "$outloc" ]; then
curl "$curl_args" --output - -- "$url" > "$outloc" || return $?
# shellcheck disable=SC2086
curl $curl_args --output - -- "$url" > "$outloc" || return $?
else
local outdir
outdir="$(mkuniqdir /tmp curl_fetch_url)"
(
cd "$outdir" || exit
curl "$curl_args" --remote-name "$url" || return $?
# shellcheck disable=SC2086
curl $curl_args --remote-name "$url" || return $?
)
outloc="$outdir/$(ls -A "$outdir")"
fi
Expand All @@ -98,13 +100,15 @@ ctorrent_fetch_url() {
torrent_outloc="$outloc.torrent"
echo "$url" > /proc/self/fd/0
if [ -n "$outloc" ]; then
curl "$curl_args" --output - -- "$url" > "$torrent_outloc" || return $?
# shellcheck disable=SC2086
curl $curl_args --output - -- "$url" > "$torrent_outloc" || return $?
else
local outdir
outdir="$(mkuniqdir /tmp torrent_fetch_url)"
(
cd "$outdir" || exit
curl "$curl_args" --remote-name "$url" || return $?
# shellcheck disable=SC2086
curl $curl_args --remote-name "$url" || return $?
)
torrent_outloc="$outdir/$(ls -A "$outdir")"
outloc=${torrent_outloc%.*}
Expand All @@ -113,7 +117,8 @@ ctorrent_fetch_url() {
warn "Downloading '$url' failed!"
return 253
fi
ctorrent "$ctorrent_args" -s "$outloc" "$torrent_outloc" >&2
# shellcheck disable=SC2086
ctorrent $ctorrent_args -s "$outloc" "$torrent_outloc" >&2
if ! [ -f "$outloc" ]; then
warn "Torrent download of '$url' failed!"
return 253
Expand Down

0 comments on commit 5f6be51

Please sign in to comment.