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

Merge pull request #67 from rstudio/jc-ua

Browse source 
Pass through custom user-agent if specified
This commit is contained in:
Jonathan Curran 2020-06-09 11:19:21 -06:00 • committed by GitHub
commit 516e791a93
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 14 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

18
install.sh
View file

@ -338,19 +338,29 @@ do_download () {
if [[ -z "${wget_rc}" ]]; then if [[ -z "${wget_rc}" ]]; then
echo "Downloading ${url}..." echo "Downloading ${url}..."
local header
if [[ -n "${RS_USER_AGENT}" ]]; then
header="--header 'User-Agent: ${RS_USER_AGENT}'"
fi
if [[ "${RUN_UNATTENDED}" -ne "0" ]]; then if [[ "${RUN_UNATTENDED}" -ne "0" ]]; then
wget -q "${url}" wget -q "${header}" "${url}"
else else
wget --progress=bar "${url}" wget --progress=bar "${header}" "${url}"
fi fi
rc=$? rc=$?
# Or, If curl is around, use that. # Or, If curl is around, use that.
elif [[ -z "${curl_rc}" ]]; then elif [[ -z "${curl_rc}" ]]; then
echo "Downloading ${url}..." echo "Downloading ${url}..."
local header
if [[ -n "${RS_USER_AGENT}" ]]; then
header="-H 'User-Agent: ${RS_USER_AGENT}'"
fi
if [[ "${RUN_UNATTENDED}" -ne "0" ]]; then if [[ "${RUN_UNATTENDED}" -ne "0" ]]; then
curl -fsSL --output "${file_name}" "${url}" curl -fsSL "${header}" --output "${file_name}" "${url}"
else else
curl -fL --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.