Merge pull request #34 from rstudio/user-agent-2

Add OS info to user agent; set user agent in system Rprofile
This commit is contained in:
Greg Lin 2019-09-09 14:39:22 -05:00 committed by GitHub
commit cacc3f17bb
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23

View file

@ -94,13 +94,23 @@ compile_r() {
make
make install
# Preserve the default HTTP user agent for R 3.6.0 and later
if _version_is_greater_than ${1} 3.6; then
cat <<'EOF' >> /opt/R/${1}/lib/R/etc/Rprofile.site
# Set default HTTP user agent
options(HTTPUserAgent = sprintf("R/%s R (%s)", getRversion(), paste(getRversion(), R.version$platform, R.version$arch, R.version$os)))
# Add OS identifier to the default HTTP user agent.
# Set this in the system Rprofile so it works when R is run with --vanilla.
cat <<EOF >> /opt/R/${1}/lib/R/library/base/R/Rprofile
## Set the default HTTP user agent
local({
os_identifier <- if (file.exists("/etc/os-release")) {
os <- readLines("/etc/os-release")
id <- gsub('^ID=|"', "", grep("^ID=", os, value = TRUE))
version <- gsub('^VERSION_ID=|"', "", grep("^VERSION_ID=", os, value = TRUE))
sprintf("%s-%s", id, version)
} else {
"${OS_IDENTIFIER}"
}
options(HTTPUserAgent = sprintf("R/%s (%s) R (%s)", getRversion(), os_identifier,
paste(getRversion(), R.version\$platform, R.version\$arch, R.version\$os)))
})
EOF
fi
}
# check for packager script