From c452bacb94cb51e49fc7777dabd1779225316923 Mon Sep 17 00:00:00 2001
From: Greg Lin <glin@rstudio.com>
Date: Thu, 22 Aug 2019 18:15:59 -0500
Subject: [PATCH] Switch user agent format

---
 builder/package.centos-7    | 6 +++---
 builder/package.debian-9    | 6 +++---
 builder/package.opensuse-15 | 6 +++---
 builder/package.opensuse-42 | 6 +++---
 builder/package.ubuntu-1604 | 6 +++---
 builder/package.ubuntu-1804 | 6 +++---
 6 files changed, 18 insertions(+), 18 deletions(-)

diff --git a/builder/package.centos-7 b/builder/package.centos-7
index 203bd55..eca0028 100644
--- a/builder/package.centos-7
+++ b/builder/package.centos-7
@@ -15,10 +15,10 @@ if [ -d /opt/R/${R_VERSION} ]; then
 fi
 EOF
 
-# Preserve the default HTTP user agent for R 3.6+
+# Set default HTTP user agent for R 3.6+
 cat <<'EOF' >> /opt/R/${R_VERSION}/lib/R/etc/Rprofile.site
-# Add OS version info to the HTTP user agent
-options(HTTPUserAgent = paste(c(utils::sessionInfo()$running, getOption("HTTPUserAgent")), collapse = "; "))
+# Set default HTTP user agent
+options(HTTPUserAgent = sprintf("R/%s R (%s)", getRversion(), paste(getRversion(), R.version$platform, R.version$arch, R.version$os)))
 EOF
 
 fpm \
diff --git a/builder/package.debian-9 b/builder/package.debian-9
index f6ee032..6cfbaeb 100644
--- a/builder/package.debian-9
+++ b/builder/package.debian-9
@@ -2,10 +2,10 @@ if [[ ! -d /tmp/output/debian-9 ]]; then
   mkdir -p /tmp/output/debian-9
 fi
 
-# Preserve the default HTTP user agent for R 3.6+
+# Set default HTTP user agent for R 3.6+
 cat <<'EOF' >> /opt/R/${R_VERSION}/lib/R/etc/Rprofile.site
-# Add OS version info to the HTTP user agent
-options(HTTPUserAgent = paste(c(utils::sessionInfo()$running, getOption("HTTPUserAgent")), collapse = "; "))
+# Set default HTTP user agent
+options(HTTPUserAgent = sprintf("R/%s R (%s)", getRversion(), paste(getRversion(), R.version$platform, R.version$arch, R.version$os)))
 EOF
 
 fpm \
diff --git a/builder/package.opensuse-15 b/builder/package.opensuse-15
index bb0e244..80e60b7 100644
--- a/builder/package.opensuse-15
+++ b/builder/package.opensuse-15
@@ -15,10 +15,10 @@ if [ -d /opt/R/${R_VERSION} ]; then
 fi
 EOF
 
-# Preserve the default HTTP user agent for R 3.6+
+# Set default HTTP user agent for R 3.6+
 cat <<'EOF' >> /opt/R/${R_VERSION}/lib/R/etc/Rprofile.site
-# Add OS version info to the HTTP user agent
-options(HTTPUserAgent = paste(c(utils::sessionInfo()$running, getOption("HTTPUserAgent")), collapse = "; "))
+# Set default HTTP user agent
+options(HTTPUserAgent = sprintf("R/%s R (%s)", getRversion(), paste(getRversion(), R.version$platform, R.version$arch, R.version$os)))
 EOF
 
 fpm \
diff --git a/builder/package.opensuse-42 b/builder/package.opensuse-42
index 88e1c85..b56e015 100644
--- a/builder/package.opensuse-42
+++ b/builder/package.opensuse-42
@@ -15,10 +15,10 @@ if [ -d /opt/R/${R_VERSION} ]; then
 fi
 EOF
 
-# Preserve the default HTTP user agent for R 3.6+
+# Set default HTTP user agent for R 3.6+
 cat <<'EOF' >> /opt/R/${R_VERSION}/lib/R/etc/Rprofile.site
-# Add OS version info to the HTTP user agent
-options(HTTPUserAgent = paste(c(utils::sessionInfo()$running, getOption("HTTPUserAgent")), collapse = "; "))
+# Set default HTTP user agent
+options(HTTPUserAgent = sprintf("R/%s R (%s)", getRversion(), paste(getRversion(), R.version$platform, R.version$arch, R.version$os)))
 EOF
 
 fpm \
diff --git a/builder/package.ubuntu-1604 b/builder/package.ubuntu-1604
index 4761d06..9d18fd0 100644
--- a/builder/package.ubuntu-1604
+++ b/builder/package.ubuntu-1604
@@ -2,10 +2,10 @@ if [[ ! -d /tmp/output/ubuntu-1604 ]]; then
   mkdir -p /tmp/output/ubuntu-1604
 fi
 
-# Preserve the default HTTP user agent for R 3.6+
+# Set default HTTP user agent for R 3.6+
 cat <<'EOF' >> /opt/R/${R_VERSION}/lib/R/etc/Rprofile.site
-# Add OS version info to the HTTP user agent
-options(HTTPUserAgent = paste(c(utils::sessionInfo()$running, getOption("HTTPUserAgent")), collapse = "; "))
+# Set default HTTP user agent
+options(HTTPUserAgent = sprintf("R/%s R (%s)", getRversion(), paste(getRversion(), R.version$platform, R.version$arch, R.version$os)))
 EOF
 
 fpm \
diff --git a/builder/package.ubuntu-1804 b/builder/package.ubuntu-1804
index dac01d8..435abf0 100644
--- a/builder/package.ubuntu-1804
+++ b/builder/package.ubuntu-1804
@@ -2,10 +2,10 @@ if [[ ! -d /tmp/output/ubuntu-1804 ]]; then
   mkdir -p /tmp/output/ubuntu-1804
 fi
 
-# Preserve the default HTTP user agent for R 3.6+
+# Set default HTTP user agent for R 3.6+
 cat <<'EOF' >> /opt/R/${R_VERSION}/lib/R/etc/Rprofile.site
-# Add OS version info to the HTTP user agent
-options(HTTPUserAgent = paste(c(utils::sessionInfo()$running, getOption("HTTPUserAgent")), collapse = "; "))
+# Set default HTTP user agent
+options(HTTPUserAgent = sprintf("R/%s R (%s)", getRversion(), paste(getRversion(), R.version$platform, R.version$arch, R.version$os)))
 EOF
 
 fpm \