From e496419e09283db6e92d67197108dfebd068a3be Mon Sep 17 00:00:00 2001
From: Greg Lin <glin@rstudio.com>
Date: Mon, 19 Aug 2019 15:42:40 -0500
Subject: [PATCH 1/4] Preserve the default HTTP user agent for R 3.6+

---
 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, 36 insertions(+)

diff --git a/builder/package.centos-7 b/builder/package.centos-7
index 76b2ee2..203bd55 100644
--- a/builder/package.centos-7
+++ b/builder/package.centos-7
@@ -15,6 +15,12 @@ if [ -d /opt/R/${R_VERSION} ]; then
 fi
 EOF
 
+# Preserve the 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 = "; "))
+EOF
+
 fpm \
   -s dir \
   -t rpm \
diff --git a/builder/package.debian-9 b/builder/package.debian-9
index 6780327..f6ee032 100644
--- a/builder/package.debian-9
+++ b/builder/package.debian-9
@@ -2,6 +2,12 @@ if [[ ! -d /tmp/output/debian-9 ]]; then
   mkdir -p /tmp/output/debian-9
 fi
 
+# Preserve the 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 = "; "))
+EOF
+
 fpm \
   -s dir \
   -t deb \
diff --git a/builder/package.opensuse-15 b/builder/package.opensuse-15
index 58e14ff..bb0e244 100644
--- a/builder/package.opensuse-15
+++ b/builder/package.opensuse-15
@@ -15,6 +15,12 @@ if [ -d /opt/R/${R_VERSION} ]; then
 fi
 EOF
 
+# Preserve the 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 = "; "))
+EOF
+
 fpm \
   -s dir \
   -t rpm \
diff --git a/builder/package.opensuse-42 b/builder/package.opensuse-42
index 4cc1837..88e1c85 100644
--- a/builder/package.opensuse-42
+++ b/builder/package.opensuse-42
@@ -15,6 +15,12 @@ if [ -d /opt/R/${R_VERSION} ]; then
 fi
 EOF
 
+# Preserve the 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 = "; "))
+EOF
+
 fpm \
   -s dir \
   -t rpm \
diff --git a/builder/package.ubuntu-1604 b/builder/package.ubuntu-1604
index 33aa081..4761d06 100644
--- a/builder/package.ubuntu-1604
+++ b/builder/package.ubuntu-1604
@@ -2,6 +2,12 @@ if [[ ! -d /tmp/output/ubuntu-1604 ]]; then
   mkdir -p /tmp/output/ubuntu-1604
 fi
 
+# Preserve the 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 = "; "))
+EOF
+
 fpm \
   -s dir \
   -t deb \
diff --git a/builder/package.ubuntu-1804 b/builder/package.ubuntu-1804
index 2b3f7c4..dac01d8 100644
--- a/builder/package.ubuntu-1804
+++ b/builder/package.ubuntu-1804
@@ -2,6 +2,12 @@ if [[ ! -d /tmp/output/ubuntu-1804 ]]; then
   mkdir -p /tmp/output/ubuntu-1804
 fi
 
+# Preserve the 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 = "; "))
+EOF
+
 fpm \
   -s dir \
   -t deb \

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 2/4] 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 \

From 92028bb31b61a71bcf63aea74fa88c6d7a211de7 Mon Sep 17 00:00:00 2001
From: Greg Lin <glin@rstudio.com>
Date: Fri, 23 Aug 2019 16:04:16 -0500
Subject: [PATCH 3/4] Set user agent during build process

---
 builder/build.sh            | 6 ++++++
 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 ------
 7 files changed, 6 insertions(+), 36 deletions(-)

diff --git a/builder/build.sh b/builder/build.sh
index 56d1754..47aa609 100755
--- a/builder/build.sh
+++ b/builder/build.sh
@@ -93,6 +93,12 @@ compile_r() {
   make clean
   make
   make install
+
+  # Preserve the default HTTP user agent for R 3.6.0 and later
+  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)))
+EOF
 }
 
 # check for packager script
diff --git a/builder/package.centos-7 b/builder/package.centos-7
index eca0028..76b2ee2 100644
--- a/builder/package.centos-7
+++ b/builder/package.centos-7
@@ -15,12 +15,6 @@ if [ -d /opt/R/${R_VERSION} ]; then
 fi
 EOF
 
-# Set default HTTP user agent for R 3.6+
-cat <<'EOF' >> /opt/R/${R_VERSION}/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)))
-EOF
-
 fpm \
   -s dir \
   -t rpm \
diff --git a/builder/package.debian-9 b/builder/package.debian-9
index 6cfbaeb..6780327 100644
--- a/builder/package.debian-9
+++ b/builder/package.debian-9
@@ -2,12 +2,6 @@ if [[ ! -d /tmp/output/debian-9 ]]; then
   mkdir -p /tmp/output/debian-9
 fi
 
-# Set default HTTP user agent for R 3.6+
-cat <<'EOF' >> /opt/R/${R_VERSION}/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)))
-EOF
-
 fpm \
   -s dir \
   -t deb \
diff --git a/builder/package.opensuse-15 b/builder/package.opensuse-15
index 80e60b7..58e14ff 100644
--- a/builder/package.opensuse-15
+++ b/builder/package.opensuse-15
@@ -15,12 +15,6 @@ if [ -d /opt/R/${R_VERSION} ]; then
 fi
 EOF
 
-# Set default HTTP user agent for R 3.6+
-cat <<'EOF' >> /opt/R/${R_VERSION}/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)))
-EOF
-
 fpm \
   -s dir \
   -t rpm \
diff --git a/builder/package.opensuse-42 b/builder/package.opensuse-42
index b56e015..4cc1837 100644
--- a/builder/package.opensuse-42
+++ b/builder/package.opensuse-42
@@ -15,12 +15,6 @@ if [ -d /opt/R/${R_VERSION} ]; then
 fi
 EOF
 
-# Set default HTTP user agent for R 3.6+
-cat <<'EOF' >> /opt/R/${R_VERSION}/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)))
-EOF
-
 fpm \
   -s dir \
   -t rpm \
diff --git a/builder/package.ubuntu-1604 b/builder/package.ubuntu-1604
index 9d18fd0..33aa081 100644
--- a/builder/package.ubuntu-1604
+++ b/builder/package.ubuntu-1604
@@ -2,12 +2,6 @@ if [[ ! -d /tmp/output/ubuntu-1604 ]]; then
   mkdir -p /tmp/output/ubuntu-1604
 fi
 
-# Set default HTTP user agent for R 3.6+
-cat <<'EOF' >> /opt/R/${R_VERSION}/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)))
-EOF
-
 fpm \
   -s dir \
   -t deb \
diff --git a/builder/package.ubuntu-1804 b/builder/package.ubuntu-1804
index 435abf0..2b3f7c4 100644
--- a/builder/package.ubuntu-1804
+++ b/builder/package.ubuntu-1804
@@ -2,12 +2,6 @@ if [[ ! -d /tmp/output/ubuntu-1804 ]]; then
   mkdir -p /tmp/output/ubuntu-1804
 fi
 
-# Set default HTTP user agent for R 3.6+
-cat <<'EOF' >> /opt/R/${R_VERSION}/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)))
-EOF
-
 fpm \
   -s dir \
   -t deb \

From 75b9a0d60d70276786f7aad9492d878c0f6ffc38 Mon Sep 17 00:00:00 2001
From: Greg Lin <glin@rstudio.com>
Date: Mon, 26 Aug 2019 14:39:46 -0500
Subject: [PATCH 4/4] Only set user agent for R 3.6.0 and later

---
 builder/build.sh | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/builder/build.sh b/builder/build.sh
index 47aa609..efe92f5 100755
--- a/builder/build.sh
+++ b/builder/build.sh
@@ -95,10 +95,12 @@ compile_r() {
   make install
 
   # Preserve the default HTTP user agent for R 3.6.0 and later
-  cat <<'EOF' >> /opt/R/${1}/lib/R/etc/Rprofile.site
+  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)))
 EOF
+  fi
 }
 
 # check for packager script