Merge pull request #482 from benz0li/478-hard-coded-arch-for-texlive-in-path

eitsupi · web-flow · commit a6c18b3663f0 · 2022-06-10T23:02:36.000+09:00
diff --git a/dockerfiles/cuda11_4.0.3.Dockerfile b/dockerfiles/cuda11_4.0.3.Dockerfile
@@ -18,7 +18,7 @@ ENV WORKON_HOME=/opt/venv
 ENV PYTHON_VENV_PATH=/opt/venv/reticulate
 ENV PYTHON_CONFIGURE_OPTS=--enable-shared
 ENV RETICULATE_MINICONDA_ENABLED=FALSE
-ENV PATH=${PYTHON_VENV_PATH}/bin:${CUDA_HOME}/bin:/usr/local/nviida/bin:${PATH}:/usr/local/texlive/bin/x86_64-linux
+ENV PATH=${PYTHON_VENV_PATH}/bin:${CUDA_HOME}/bin:/usr/local/nviida/bin:${PATH}:/usr/local/texlive/bin/linux
 
 RUN /rocker_scripts/install_cuda-11.1.sh
 RUN /rocker_scripts/config_R_cuda.sh
diff --git a/dockerfiles/cuda11_4.0.4.Dockerfile b/dockerfiles/cuda11_4.0.4.Dockerfile
@@ -18,7 +18,7 @@ ENV WORKON_HOME=/opt/venv
 ENV PYTHON_VENV_PATH=/opt/venv/reticulate
 ENV PYTHON_CONFIGURE_OPTS=--enable-shared
 ENV RETICULATE_MINICONDA_ENABLED=FALSE
-ENV PATH=${PYTHON_VENV_PATH}/bin:${CUDA_HOME}/bin:/usr/local/nviida/bin:${PATH}:/usr/local/texlive/bin/x86_64-linux
+ENV PATH=${PYTHON_VENV_PATH}/bin:${CUDA_HOME}/bin:/usr/local/nviida/bin:${PATH}:/usr/local/texlive/bin/linux
 
 RUN /rocker_scripts/install_cuda-11.1.sh
 RUN /rocker_scripts/config_R_cuda.sh
diff --git a/dockerfiles/cuda11_4.0.5.Dockerfile b/dockerfiles/cuda11_4.0.5.Dockerfile
@@ -18,7 +18,7 @@ ENV WORKON_HOME=/opt/venv
 ENV PYTHON_VENV_PATH=/opt/venv/reticulate
 ENV PYTHON_CONFIGURE_OPTS=--enable-shared
 ENV RETICULATE_MINICONDA_ENABLED=FALSE
-ENV PATH=${PYTHON_VENV_PATH}/bin:${CUDA_HOME}/bin:/usr/local/nviida/bin:${PATH}:/usr/local/texlive/bin/x86_64-linux
+ENV PATH=${PYTHON_VENV_PATH}/bin:${CUDA_HOME}/bin:/usr/local/nviida/bin:${PATH}:/usr/local/texlive/bin/linux
 
 RUN /rocker_scripts/install_cuda-11.1.sh
 RUN /rocker_scripts/config_R_cuda.sh
diff --git a/dockerfiles/cuda_4.0.3.Dockerfile b/dockerfiles/cuda_4.0.3.Dockerfile
@@ -17,7 +17,7 @@ ENV WORKON_HOME=/opt/venv
 ENV PYTHON_VENV_PATH=/opt/venv/reticulate
 ENV PYTHON_CONFIGURE_OPTS=--enable-shared
 ENV RETICULATE_AUTOCONFIGURE=0
-ENV PATH=${PYTHON_VENV_PATH}/bin:$PATH:${CUDA_HOME}/bin:/usr/local/texlive/bin/x86_64-linux
+ENV PATH=${PYTHON_VENV_PATH}/bin:$PATH:${CUDA_HOME}/bin:/usr/local/texlive/bin/linux
 
 RUN /rocker_scripts/install_cuda-10.1.sh
 RUN /rocker_scripts/config_R_cuda.sh
diff --git a/dockerfiles/cuda_4.0.4.Dockerfile b/dockerfiles/cuda_4.0.4.Dockerfile
@@ -17,7 +17,7 @@ ENV WORKON_HOME=/opt/venv
 ENV PYTHON_VENV_PATH=/opt/venv/reticulate
 ENV PYTHON_CONFIGURE_OPTS=--enable-shared
 ENV RETICULATE_AUTOCONFIGURE=0
-ENV PATH=${PYTHON_VENV_PATH}/bin:$PATH:${CUDA_HOME}/bin:/usr/local/texlive/bin/x86_64-linux
+ENV PATH=${PYTHON_VENV_PATH}/bin:$PATH:${CUDA_HOME}/bin:/usr/local/texlive/bin/linux
 
 RUN /rocker_scripts/install_cuda-10.1.sh
 RUN /rocker_scripts/config_R_cuda.sh
diff --git a/dockerfiles/cuda_4.0.5.Dockerfile b/dockerfiles/cuda_4.0.5.Dockerfile
@@ -17,7 +17,7 @@ ENV WORKON_HOME=/opt/venv
 ENV PYTHON_VENV_PATH=/opt/venv/reticulate
 ENV PYTHON_CONFIGURE_OPTS=--enable-shared
 ENV RETICULATE_AUTOCONFIGURE=0
-ENV PATH=${PYTHON_VENV_PATH}/bin:$PATH:${CUDA_HOME}/bin:/usr/local/texlive/bin/x86_64-linux
+ENV PATH=${PYTHON_VENV_PATH}/bin:$PATH:${CUDA_HOME}/bin:/usr/local/texlive/bin/linux
 
 RUN /rocker_scripts/install_cuda-10.1.sh
 RUN /rocker_scripts/config_R_cuda.sh
diff --git a/dockerfiles/cuda_4.1.0.Dockerfile b/dockerfiles/cuda_4.1.0.Dockerfile
@@ -17,7 +17,7 @@ ENV WORKON_HOME=/opt/venv
 ENV PYTHON_VENV_PATH=/opt/venv/reticulate
 ENV PYTHON_CONFIGURE_OPTS=--enable-shared
 ENV RETICULATE_AUTOCONFIGURE=0
-ENV PATH=${PYTHON_VENV_PATH}/bin:$PATH:${CUDA_HOME}/bin:/usr/local/texlive/bin/x86_64-linux
+ENV PATH=${PYTHON_VENV_PATH}/bin:$PATH:${CUDA_HOME}/bin:/usr/local/texlive/bin/linux
 
 RUN /rocker_scripts/install_cuda-10.1.sh
 RUN /rocker_scripts/config_R_cuda.sh
diff --git a/dockerfiles/cuda_4.1.1.Dockerfile b/dockerfiles/cuda_4.1.1.Dockerfile
@@ -17,7 +17,7 @@ ENV WORKON_HOME=/opt/venv
 ENV PYTHON_VENV_PATH=/opt/venv/reticulate
 ENV PYTHON_CONFIGURE_OPTS=--enable-shared
 ENV RETICULATE_AUTOCONFIGURE=0
-ENV PATH=${PYTHON_VENV_PATH}/bin:$PATH:${CUDA_HOME}/bin:/usr/local/texlive/bin/x86_64-linux
+ENV PATH=${PYTHON_VENV_PATH}/bin:$PATH:${CUDA_HOME}/bin:/usr/local/texlive/bin/linux
 
 RUN /rocker_scripts/install_cuda-10.1.sh
 RUN /rocker_scripts/config_R_cuda.sh
diff --git a/dockerfiles/cuda_4.1.2.Dockerfile b/dockerfiles/cuda_4.1.2.Dockerfile
@@ -17,7 +17,7 @@ ENV WORKON_HOME=/opt/venv
 ENV PYTHON_VENV_PATH=/opt/venv/reticulate
 ENV PYTHON_CONFIGURE_OPTS=--enable-shared
 ENV RETICULATE_AUTOCONFIGURE=0
-ENV PATH=${PYTHON_VENV_PATH}/bin:$PATH:${CUDA_HOME}/bin:/usr/local/texlive/bin/x86_64-linux
+ENV PATH=${PYTHON_VENV_PATH}/bin:$PATH:${CUDA_HOME}/bin:/usr/local/texlive/bin/linux
 
 RUN /rocker_scripts/install_cuda-10.1.sh
 RUN /rocker_scripts/config_R_cuda.sh
diff --git a/dockerfiles/cuda_4.1.3.Dockerfile b/dockerfiles/cuda_4.1.3.Dockerfile
@@ -17,7 +17,7 @@ ENV WORKON_HOME=/opt/venv
 ENV PYTHON_VENV_PATH=/opt/venv/reticulate
 ENV PYTHON_CONFIGURE_OPTS=--enable-shared
 ENV RETICULATE_AUTOCONFIGURE=0
-ENV PATH=${PYTHON_VENV_PATH}/bin:$PATH:${CUDA_HOME}/bin:/usr/local/texlive/bin/x86_64-linux
+ENV PATH=${PYTHON_VENV_PATH}/bin:$PATH:${CUDA_HOME}/bin:/usr/local/texlive/bin/linux
 
 RUN /rocker_scripts/install_cuda-10.1.sh
 RUN /rocker_scripts/config_R_cuda.sh
diff --git a/dockerfiles/cuda_4.2.0.Dockerfile b/dockerfiles/cuda_4.2.0.Dockerfile
@@ -17,7 +17,7 @@ ENV WORKON_HOME=/opt/venv
 ENV PYTHON_VENV_PATH=/opt/venv/reticulate
 ENV PYTHON_CONFIGURE_OPTS=--enable-shared
 ENV RETICULATE_AUTOCONFIGURE=0
-ENV PATH=${PYTHON_VENV_PATH}/bin:$PATH:${CUDA_HOME}/bin:/usr/local/texlive/bin/x86_64-linux
+ENV PATH=${PYTHON_VENV_PATH}/bin:$PATH:${CUDA_HOME}/bin:/usr/local/texlive/bin/linux
 
 RUN /rocker_scripts/install_cuda-10.1.sh
 RUN /rocker_scripts/config_R_cuda.sh
diff --git a/dockerfiles/cuda_devel.Dockerfile b/dockerfiles/cuda_devel.Dockerfile
@@ -17,7 +17,7 @@ ENV WORKON_HOME=/opt/venv
 ENV PYTHON_VENV_PATH=/opt/venv/reticulate
 ENV PYTHON_CONFIGURE_OPTS=--enable-shared
 ENV RETICULATE_AUTOCONFIGURE=0
-ENV PATH=${PYTHON_VENV_PATH}/bin:$PATH:${CUDA_HOME}/bin:/usr/local/texlive/bin/x86_64-linux
+ENV PATH=${PYTHON_VENV_PATH}/bin:$PATH:${CUDA_HOME}/bin:/usr/local/texlive/bin/linux
 
 RUN /rocker_scripts/install_cuda-10.1.sh
 RUN /rocker_scripts/config_R_cuda.sh
diff --git a/dockerfiles/verse_4.0.0.Dockerfile b/dockerfiles/verse_4.0.0.Dockerfile
@@ -6,6 +6,6 @@ LABEL org.opencontainers.image.licenses="GPL-2.0-or-later" \
       org.opencontainers.image.authors="Carl Boettiger <cboettig@ropensci.org>"
 
 ENV CTAN_REPO=https://www.texlive.info/tlnet-archive/2020/06/05/tlnet
-ENV PATH=/usr/local/texlive/bin/x86_64-linux:$PATH
+ENV PATH=/usr/local/texlive/bin/linux:$PATH
 
 RUN /rocker_scripts/install_verse.sh
diff --git a/dockerfiles/verse_4.0.1.Dockerfile b/dockerfiles/verse_4.0.1.Dockerfile
@@ -6,6 +6,6 @@ LABEL org.opencontainers.image.licenses="GPL-2.0-or-later" \
       org.opencontainers.image.authors="Carl Boettiger <cboettig@ropensci.org>"
 
 ENV CTAN_REPO=https://www.texlive.info/tlnet-archive/2020/06/21/tlnet
-ENV PATH=/usr/local/texlive/bin/x86_64-linux:$PATH
+ENV PATH=/usr/local/texlive/bin/linux:$PATH
 
 RUN /rocker_scripts/install_verse.sh
diff --git a/dockerfiles/verse_4.0.2.Dockerfile b/dockerfiles/verse_4.0.2.Dockerfile
@@ -6,6 +6,6 @@ LABEL org.opencontainers.image.licenses="GPL-2.0-or-later" \
       org.opencontainers.image.authors="Carl Boettiger <cboettig@ropensci.org>"
 
 ENV CTAN_REPO=https://www.texlive.info/tlnet-archive/2020/10/07/tlnet
-ENV PATH=/usr/local/texlive/bin/x86_64-linux:$PATH
+ENV PATH=/usr/local/texlive/bin/linux:$PATH
 
 RUN /rocker_scripts/install_verse.sh
diff --git a/dockerfiles/verse_4.0.3.Dockerfile b/dockerfiles/verse_4.0.3.Dockerfile
@@ -6,6 +6,6 @@ LABEL org.opencontainers.image.licenses="GPL-2.0-or-later" \
       org.opencontainers.image.authors="Carl Boettiger <cboettig@ropensci.org>"
 
 ENV CTAN_REPO=https://www.texlive.info/tlnet-archive/2021/02/14/tlnet
-ENV PATH=/usr/local/texlive/bin/x86_64-linux:$PATH
+ENV PATH=/usr/local/texlive/bin/linux:$PATH
 
 RUN /rocker_scripts/install_verse.sh
diff --git a/dockerfiles/verse_4.0.4.Dockerfile b/dockerfiles/verse_4.0.4.Dockerfile
@@ -6,6 +6,6 @@ LABEL org.opencontainers.image.licenses="GPL-2.0-or-later" \
       org.opencontainers.image.authors="Carl Boettiger <cboettig@ropensci.org>"
 
 ENV CTAN_REPO=https://www.texlive.info/tlnet-archive/2021/03/30/tlnet
-ENV PATH=/usr/local/texlive/bin/x86_64-linux:$PATH
+ENV PATH=/usr/local/texlive/bin/linux:$PATH
 
 RUN /rocker_scripts/install_verse.sh
diff --git a/dockerfiles/verse_4.0.5.Dockerfile b/dockerfiles/verse_4.0.5.Dockerfile
@@ -6,6 +6,6 @@ LABEL org.opencontainers.image.licenses="GPL-2.0-or-later" \
       org.opencontainers.image.authors="Carl Boettiger <cboettig@ropensci.org>"
 
 ENV CTAN_REPO=https://www.texlive.info/tlnet-archive/2021/05/17/tlnet
-ENV PATH=$PATH:/usr/local/texlive/bin/x86_64-linux
+ENV PATH=$PATH:/usr/local/texlive/bin/linux
 
 RUN /rocker_scripts/install_verse.sh
diff --git a/dockerfiles/verse_4.1.0.Dockerfile b/dockerfiles/verse_4.1.0.Dockerfile
@@ -6,7 +6,7 @@ LABEL org.opencontainers.image.licenses="GPL-2.0-or-later" \
       org.opencontainers.image.authors="Carl Boettiger <cboettig@ropensci.org>"
 
 ENV CTAN_REPO=https://www.texlive.info/tlnet-archive/2021/08/09/tlnet
-ENV PATH=$PATH:/usr/local/texlive/bin/x86_64-linux
+ENV PATH=$PATH:/usr/local/texlive/bin/linux
 ENV QUARTO_VERSION=latest
 
 RUN /rocker_scripts/install_verse.sh
diff --git a/dockerfiles/verse_4.1.1.Dockerfile b/dockerfiles/verse_4.1.1.Dockerfile
@@ -6,7 +6,7 @@ LABEL org.opencontainers.image.licenses="GPL-2.0-or-later" \
       org.opencontainers.image.authors="Carl Boettiger <cboettig@ropensci.org>"
 
 ENV CTAN_REPO=https://www.texlive.info/tlnet-archive/2021/10/31/tlnet
-ENV PATH=$PATH:/usr/local/texlive/bin/x86_64-linux
+ENV PATH=$PATH:/usr/local/texlive/bin/linux
 ENV QUARTO_VERSION=latest
 
 RUN /rocker_scripts/install_verse.sh
diff --git a/dockerfiles/verse_4.1.2.Dockerfile b/dockerfiles/verse_4.1.2.Dockerfile
@@ -6,7 +6,7 @@ LABEL org.opencontainers.image.licenses="GPL-2.0-or-later" \
       org.opencontainers.image.authors="Carl Boettiger <cboettig@ropensci.org>"
 
 ENV CTAN_REPO=https://www.texlive.info/tlnet-archive/2022/03/09/tlnet
-ENV PATH=$PATH:/usr/local/texlive/bin/x86_64-linux
+ENV PATH=$PATH:/usr/local/texlive/bin/linux
 ENV QUARTO_VERSION=latest
 
 RUN /rocker_scripts/install_verse.sh
diff --git a/dockerfiles/verse_4.1.3.Dockerfile b/dockerfiles/verse_4.1.3.Dockerfile
@@ -6,7 +6,7 @@ LABEL org.opencontainers.image.licenses="GPL-2.0-or-later" \
       org.opencontainers.image.authors="Carl Boettiger <cboettig@ropensci.org>"
 
 ENV CTAN_REPO=https://www.texlive.info/tlnet-archive/2022/04/21/tlnet
-ENV PATH=$PATH:/usr/local/texlive/bin/x86_64-linux
+ENV PATH=$PATH:/usr/local/texlive/bin/linux
 ENV QUARTO_VERSION=latest
 
 RUN /rocker_scripts/install_verse.sh
diff --git a/dockerfiles/verse_4.2.0.Dockerfile b/dockerfiles/verse_4.2.0.Dockerfile
@@ -6,7 +6,7 @@ LABEL org.opencontainers.image.licenses="GPL-2.0-or-later" \
       org.opencontainers.image.authors="Carl Boettiger <cboettig@ropensci.org>"
 
 ENV CTAN_REPO=https://mirror.ctan.org/systems/texlive/tlnet
-ENV PATH=$PATH:/usr/local/texlive/bin/x86_64-linux
+ENV PATH=$PATH:/usr/local/texlive/bin/linux
 ENV QUARTO_VERSION=latest
 
 RUN /rocker_scripts/install_verse.sh
diff --git a/dockerfiles/verse_devel.Dockerfile b/dockerfiles/verse_devel.Dockerfile
@@ -6,7 +6,7 @@ LABEL org.opencontainers.image.licenses="GPL-2.0-or-later" \
       org.opencontainers.image.authors="Carl Boettiger <cboettig@ropensci.org>"
 
 ENV CTAN_REPO=https://mirror.ctan.org/systems/texlive/tlnet
-ENV PATH=$PATH:/usr/local/texlive/bin/x86_64-linux
+ENV PATH=$PATH:/usr/local/texlive/bin/linux
 ENV QUARTO_VERSION=latest
 
 RUN /rocker_scripts/install_verse.sh
diff --git a/dockerfiles/verse_latest-daily.Dockerfile b/dockerfiles/verse_latest-daily.Dockerfile
@@ -6,7 +6,7 @@ LABEL org.opencontainers.image.licenses="GPL-2.0-or-later" \
       org.opencontainers.image.authors="Carl Boettiger <cboettig@ropensci.org>"
 
 ENV CTAN_REPO=https://mirror.ctan.org/systems/texlive/tlnet
-ENV PATH=$PATH:/usr/local/texlive/bin/x86_64-linux
+ENV PATH=$PATH:/usr/local/texlive/bin/linux
 ENV QUARTO_VERSION=latest
 
 RUN /rocker_scripts/install_verse.sh
diff --git a/scripts/install_texlive.sh b/scripts/install_texlive.sh
@@ -28,7 +28,7 @@ option_doc 0
 option_src 0
 EOF
 
-export PATH="${PATH}:/usr/local/texlive/bin/${ARCH}-linux/"
+export PATH="${PATH}:/usr/local/texlive/bin/linux/"
 
 mkdir -p /opt/texlive
 # set up packages
@@ -45,6 +45,8 @@ cd ..
 rm -rf install-tl-*
 rm /tmp/texlive-profile.txt
 
+ln -fsr /usr/local/texlive/bin/"${ARCH}"-linux /usr/local/texlive/bin/linux
+
 tlmgr update --self
 tlmgr install latex-bin luatex xetex
 tlmgr install ae bibtex context inconsolata listings makeindex metafont mfware parskip pdfcrop tex tools url xkeyval
diff --git a/stacks/4.0.0.json b/stacks/4.0.0.json
@@ -88,7 +88,7 @@
       "FROM": "rocker/tidyverse:4.0.0",
       "ENV": {
         "CTAN_REPO": "https://www.texlive.info/tlnet-archive/2020/06/05/tlnet",
-        "PATH": "/usr/local/texlive/bin/x86_64-linux:$PATH"
+        "PATH": "/usr/local/texlive/bin/linux:$PATH"
       },
       "RUN": "/rocker_scripts/install_verse.sh",
       "tags": [
diff --git a/stacks/4.0.1.json b/stacks/4.0.1.json
@@ -79,7 +79,7 @@
       "FROM": "rocker/tidyverse:4.0.1",
       "ENV": {
         "CTAN_REPO": "https://www.texlive.info/tlnet-archive/2020/06/21/tlnet",
-        "PATH": "/usr/local/texlive/bin/x86_64-linux:$PATH"
+        "PATH": "/usr/local/texlive/bin/linux:$PATH"
       },
       "RUN": "/rocker_scripts/install_verse.sh",
       "tags": [
diff --git a/stacks/4.0.2.json b/stacks/4.0.2.json
@@ -79,7 +79,7 @@
       "FROM": "rocker/tidyverse:4.0.2",
       "ENV": {
         "CTAN_REPO": "https://www.texlive.info/tlnet-archive/2020/10/07/tlnet",
-        "PATH": "/usr/local/texlive/bin/x86_64-linux:$PATH"
+        "PATH": "/usr/local/texlive/bin/linux:$PATH"
       },
       "RUN": "/rocker_scripts/install_verse.sh",
       "tags": [
diff --git a/stacks/4.0.3.json b/stacks/4.0.3.json
@@ -79,7 +79,7 @@
       "FROM": "rocker/tidyverse:4.0.3",
       "ENV": {
         "CTAN_REPO": "https://www.texlive.info/tlnet-archive/2021/02/14/tlnet",
-        "PATH": "/usr/local/texlive/bin/x86_64-linux:$PATH"
+        "PATH": "/usr/local/texlive/bin/linux:$PATH"
       },
       "RUN": "/rocker_scripts/install_verse.sh",
       "tags": [
@@ -175,7 +175,7 @@
         "PYTHON_VENV_PATH": "/opt/venv/reticulate",
         "PYTHON_CONFIGURE_OPTS": "--enable-shared",
         "RETICULATE_AUTOCONFIGURE": "0",
-        "PATH": "${PYTHON_VENV_PATH}/bin:$PATH:${CUDA_HOME}/bin:/usr/local/texlive/bin/x86_64-linux"
+        "PATH": "${PYTHON_VENV_PATH}/bin:$PATH:${CUDA_HOME}/bin:/usr/local/texlive/bin/linux"
       },
       "RUN": [
         "/rocker_scripts/install_cuda-10.1.sh",
@@ -256,7 +256,7 @@
         "PYTHON_VENV_PATH": "/opt/venv/reticulate",
         "PYTHON_CONFIGURE_OPTS": "--enable-shared",
         "RETICULATE_MINICONDA_ENABLED": "FALSE",
-        "PATH": "${PYTHON_VENV_PATH}/bin:${CUDA_HOME}/bin:/usr/local/nviida/bin:${PATH}:/usr/local/texlive/bin/x86_64-linux"
+        "PATH": "${PYTHON_VENV_PATH}/bin:${CUDA_HOME}/bin:/usr/local/nviida/bin:${PATH}:/usr/local/texlive/bin/linux"
       },
       "RUN": [
         "/rocker_scripts/install_cuda-11.1.sh",
diff --git a/stacks/4.0.4.json b/stacks/4.0.4.json
@@ -79,7 +79,7 @@
       "FROM": "rocker/tidyverse:4.0.4",
       "ENV": {
         "CTAN_REPO": "https://www.texlive.info/tlnet-archive/2021/03/30/tlnet",
-        "PATH": "/usr/local/texlive/bin/x86_64-linux:$PATH"
+        "PATH": "/usr/local/texlive/bin/linux:$PATH"
       },
       "RUN": "/rocker_scripts/install_verse.sh",
       "tags": [
@@ -175,7 +175,7 @@
         "PYTHON_VENV_PATH": "/opt/venv/reticulate",
         "PYTHON_CONFIGURE_OPTS": "--enable-shared",
         "RETICULATE_AUTOCONFIGURE": "0",
-        "PATH": "${PYTHON_VENV_PATH}/bin:$PATH:${CUDA_HOME}/bin:/usr/local/texlive/bin/x86_64-linux"
+        "PATH": "${PYTHON_VENV_PATH}/bin:$PATH:${CUDA_HOME}/bin:/usr/local/texlive/bin/linux"
       },
       "RUN": [
         "/rocker_scripts/install_cuda-10.1.sh",
@@ -256,7 +256,7 @@
         "PYTHON_VENV_PATH": "/opt/venv/reticulate",
         "PYTHON_CONFIGURE_OPTS": "--enable-shared",
         "RETICULATE_MINICONDA_ENABLED": "FALSE",
-        "PATH": "${PYTHON_VENV_PATH}/bin:${CUDA_HOME}/bin:/usr/local/nviida/bin:${PATH}:/usr/local/texlive/bin/x86_64-linux"
+        "PATH": "${PYTHON_VENV_PATH}/bin:${CUDA_HOME}/bin:/usr/local/nviida/bin:${PATH}:/usr/local/texlive/bin/linux"
       },
       "RUN": [
         "/rocker_scripts/install_cuda-11.1.sh",
diff --git a/stacks/4.0.5.json b/stacks/4.0.5.json
@@ -82,7 +82,7 @@
       "FROM": "rocker/tidyverse:4.0.5",
       "ENV": {
         "CTAN_REPO": "https://www.texlive.info/tlnet-archive/2021/05/17/tlnet",
-        "PATH": "$PATH:/usr/local/texlive/bin/x86_64-linux"
+        "PATH": "$PATH:/usr/local/texlive/bin/linux"
       },
       "RUN": "/rocker_scripts/install_verse.sh",
       "tags": [
@@ -185,7 +185,7 @@
         "PYTHON_VENV_PATH": "/opt/venv/reticulate",
         "PYTHON_CONFIGURE_OPTS": "--enable-shared",
         "RETICULATE_AUTOCONFIGURE": "0",
-        "PATH": "${PYTHON_VENV_PATH}/bin:$PATH:${CUDA_HOME}/bin:/usr/local/texlive/bin/x86_64-linux"
+        "PATH": "${PYTHON_VENV_PATH}/bin:$PATH:${CUDA_HOME}/bin:/usr/local/texlive/bin/linux"
       },
       "RUN": [
         "/rocker_scripts/install_cuda-10.1.sh",
@@ -270,7 +270,7 @@
         "PYTHON_VENV_PATH": "/opt/venv/reticulate",
         "PYTHON_CONFIGURE_OPTS": "--enable-shared",
         "RETICULATE_MINICONDA_ENABLED": "FALSE",
-        "PATH": "${PYTHON_VENV_PATH}/bin:${CUDA_HOME}/bin:/usr/local/nviida/bin:${PATH}:/usr/local/texlive/bin/x86_64-linux"
+        "PATH": "${PYTHON_VENV_PATH}/bin:${CUDA_HOME}/bin:/usr/local/nviida/bin:${PATH}:/usr/local/texlive/bin/linux"
       },
       "RUN": [
         "/rocker_scripts/install_cuda-11.1.sh",
diff --git a/stacks/4.1.0.json b/stacks/4.1.0.json
@@ -97,7 +97,7 @@
       "FROM": "rocker/tidyverse:4.1.0",
       "ENV": {
         "CTAN_REPO": "https://www.texlive.info/tlnet-archive/2021/08/09/tlnet",
-        "PATH": "$PATH:/usr/local/texlive/bin/x86_64-linux",
+        "PATH": "$PATH:/usr/local/texlive/bin/linux",
         "QUARTO_VERSION": "latest"
       },
       "RUN": [
@@ -197,7 +197,7 @@
         "PYTHON_VENV_PATH": "/opt/venv/reticulate",
         "PYTHON_CONFIGURE_OPTS": "--enable-shared",
         "RETICULATE_AUTOCONFIGURE": "0",
-        "PATH": "${PYTHON_VENV_PATH}/bin:$PATH:${CUDA_HOME}/bin:/usr/local/texlive/bin/x86_64-linux"
+        "PATH": "${PYTHON_VENV_PATH}/bin:$PATH:${CUDA_HOME}/bin:/usr/local/texlive/bin/linux"
       },
       "RUN": [
         "/rocker_scripts/install_cuda-10.1.sh",
diff --git a/stacks/4.1.1.json b/stacks/4.1.1.json
@@ -97,7 +97,7 @@
       "FROM": "rocker/tidyverse:4.1.1",
       "ENV": {
         "CTAN_REPO": "https://www.texlive.info/tlnet-archive/2021/10/31/tlnet",
-        "PATH": "$PATH:/usr/local/texlive/bin/x86_64-linux",
+        "PATH": "$PATH:/usr/local/texlive/bin/linux",
         "QUARTO_VERSION": "latest"
       },
       "RUN": [
@@ -197,7 +197,7 @@
         "PYTHON_VENV_PATH": "/opt/venv/reticulate",
         "PYTHON_CONFIGURE_OPTS": "--enable-shared",
         "RETICULATE_AUTOCONFIGURE": "0",
-        "PATH": "${PYTHON_VENV_PATH}/bin:$PATH:${CUDA_HOME}/bin:/usr/local/texlive/bin/x86_64-linux"
+        "PATH": "${PYTHON_VENV_PATH}/bin:$PATH:${CUDA_HOME}/bin:/usr/local/texlive/bin/linux"
       },
       "RUN": [
         "/rocker_scripts/install_cuda-10.1.sh",
diff --git a/stacks/4.1.2.json b/stacks/4.1.2.json
@@ -97,7 +97,7 @@
       "FROM": "rocker/tidyverse:4.1.2",
       "ENV": {
         "CTAN_REPO": "https://www.texlive.info/tlnet-archive/2022/03/09/tlnet",
-        "PATH": "$PATH:/usr/local/texlive/bin/x86_64-linux",
+        "PATH": "$PATH:/usr/local/texlive/bin/linux",
         "QUARTO_VERSION": "latest"
       },
       "RUN": [
@@ -197,7 +197,7 @@
         "PYTHON_VENV_PATH": "/opt/venv/reticulate",
         "PYTHON_CONFIGURE_OPTS": "--enable-shared",
         "RETICULATE_AUTOCONFIGURE": "0",
-        "PATH": "${PYTHON_VENV_PATH}/bin:$PATH:${CUDA_HOME}/bin:/usr/local/texlive/bin/x86_64-linux"
+        "PATH": "${PYTHON_VENV_PATH}/bin:$PATH:${CUDA_HOME}/bin:/usr/local/texlive/bin/linux"
       },
       "RUN": [
         "/rocker_scripts/install_cuda-10.1.sh",
diff --git a/stacks/4.1.3.json b/stacks/4.1.3.json
diff --git a/stacks/4.2.0.json b/stacks/4.2.0.json
diff --git a/stacks/core-latest-daily.json b/stacks/core-latest-daily.json
diff --git a/stacks/devel.json b/stacks/devel.json
