From 5c823d7c0b55fd9552088d7dbe6c4bde8e2e6281 Mon Sep 17 00:00:00 2001
From: Franciszek Walkowiak <franciszek.walkowiak@roche.com>
Date: Wed, 6 Dec 2023 13:45:33 +0100
Subject: [PATCH] Test

---
 Dockerfile                  |  1 +
 scripts/install_cran_pkgs.R | 16 ++++++++--------
 2 files changed, 9 insertions(+), 8 deletions(-)

diff --git a/Dockerfile b/Dockerfile
index 5c31942..18e9af6 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -49,6 +49,7 @@ RUN ./install_cran_pkgs.R ${DISTRIBUTION} && \
         install_other_pkgs.R \
         install_pip_pkgs.py
 
+# Prevent pushing of the image without pdflatex installed.
 RUN pdflatex --version
 
 # Run RStudio
diff --git a/scripts/install_cran_pkgs.R b/scripts/install_cran_pkgs.R
index 1bc6ea0..c30fc31 100755
--- a/scripts/install_cran_pkgs.R
+++ b/scripts/install_cran_pkgs.R
@@ -282,10 +282,10 @@ tlmgr install makeindex metafont mfware inconsolata tex ae parskip listings xcol
 tlmgr path add
 '
   # nolint end
-  exit_code <- system2("bash", args = c("-c", shQuote(tinytex_installer)), stdout = FALSE, stderr = FALSE)
-  cat("TinyTex installation exit code:", exit_code, "\n")
-  if (exit_code != 0) {
-    quit(status = exit_code, save = "no")
+  exit_status <- system2("bash", args = c("-c", shQuote(tinytex_installer)), stdout = TRUE, stderr = TRUE)
+  if ("status" %in% names(attributes(exit_status))) {
+    cat("TinyTex installer exited with code =", attr(exit_status, "status"), "\n")
+    quit(status = attr(exit_status, "status"))
   }
   tinytex::r_texmf()
   permission_update <- '
@@ -295,10 +295,10 @@ chmod -R g+wx /opt/TinyTeX/bin
 export PATH=/opt/TinyTeX/bin/x86_64-linux:${PATH}
 echo "PATH=${PATH}" >> ${R_HOME}/etc/Renviron
 '
-  exit_code <- system2("bash", args = c("-c", shQuote(permission_update)), stdout = FALSE, stderr = FALSE)
-  cat("TinyTex permission update exit code:", exit_code, "\n")
-  if (exit_code != 0) {
-    quit(status = exit_code, save = "no")
+  exit_status <- system2("bash", args = c("-c", shQuote(permission_update)), stdout = TRUE, stderr = TRUE)
+  if ("status" %in% names(attributes(exit_status))) {
+    cat("TinyTex permission update exited with code =", attr(exit_status, "status"), "\n")
+    quit(status = attr(exit_status, "status"))
   }
 }