devxy/r-builds
Watch
2
0
Fork
You've already forked r-builds
 0
Code Issues 1 Pull requests Releases Activity

Merge pull request #68 from rstudio/jc-fix

Browse source 
Fix header argument to curl and wget
This commit is contained in:
Jonathan Curran 2020-06-09 16:51:05 -06:00 • committed by GitHub
commit 2e5cfa7cd8
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 5 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

10
install.sh
View file

@ -340,13 +340,13 @@ do_download () {
echo "Downloading ${url}..." echo "Downloading ${url}..."
local header local header
if [[ -n "${RS_USER_AGENT}" ]]; then if [[ -n "${RS_USER_AGENT}" ]]; then
header="--header 'User-Agent: ${RS_USER_AGENT}'" header="--header='User-Agent: ${RS_USER_AGENT}'"
fi fi
if [[ "${RUN_UNATTENDED}" -ne "0" ]]; then if [[ "${RUN_UNATTENDED}" -ne "0" ]]; then
wget -q "${header}" "${url}" wget -q "${header[@]}" "${url}"
else else
wget --progress=bar "${header}" "${url}" wget --progress=bar "${header[@]}" "${url}"
fi fi
rc=$? rc=$?
# Or, If curl is around, use that. # Or, If curl is around, use that.
@ -358,9 +358,9 @@ do_download () {
fi fi
if [[ "${RUN_UNATTENDED}" -ne "0" ]]; then if [[ "${RUN_UNATTENDED}" -ne "0" ]]; then
curl -fsSL "${header}" --output "${file_name}" "${url}" curl -fsSL "${header[@]}" --output "${file_name}" "${url}"
else else
curl -fL "${header}" --output "${file_name}" --progress-bar "${url}" curl -fL "${header[@]}" --output "${file_name}" --progress-bar "${url}"
fi fi
rc=$? rc=$?
# Otherwise, we can't go on. # Otherwise, we can't go on.