Merge pull request #69 from rstudio/jc-user-agent

Use default user-agent
This commit is contained in:
Jonathan Curran 2020-06-15 14:02:58 -06:00 committed by GitHub
commit 6bd815f1e7
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23

View file

@ -338,29 +338,20 @@ do_download () {
if [[ -z "${wget_rc}" ]]; then
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
wget -q "${header[@]}" "${url}"
wget -q --header "User-Agent: ${RS_USER_AGENT:-r-builds}" "${url}"
else
wget --progress=bar "${header[@]}" "${url}"
wget --progress=bar --header "User-Agent: ${RS_USER_AGENT:-r-builds}" "${url}"
fi
rc=$?
# Or, If curl is around, use that.
elif [[ -z "${curl_rc}" ]]; then
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
curl -fsSL "${header[@]}" --output "${file_name}" "${url}"
curl -fsSL -H "User-Agent: ${RS_USER_AGENT:-r-builds}" --output "${file_name}" "${url}"
else
curl -fL "${header[@]}" --output "${file_name}" --progress-bar "${url}"
curl -fL -H "User-Agent: ${RS_USER_AGENT:-r-builds}" --output "${file_name}" --progress-bar "${url}"
fi
rc=$?
# Otherwise, we can't go on.