From f47cb42599e147db5cb2aaad24e24cc3967c2457 Mon Sep 17 00:00:00 2001 From: Yihui Xie Date: Wed, 29 Jan 2025 22:36:24 -0600 Subject: [PATCH] fix #460: use `install-unix` (which was a typo) for the installer filename for TinyTeX <= v2025.01, and `installer-unix` for higher versions --- DESCRIPTION | 2 +- tinytex.Rproj | 1 + tools/install-bin-unix.sh | 6 +++++- 3 files changed, 7 insertions(+), 2 deletions(-) diff --git a/DESCRIPTION b/DESCRIPTION index 21ddcf108..4f800f2c6 100644 --- a/DESCRIPTION +++ b/DESCRIPTION @@ -1,7 +1,7 @@ Package: tinytex Type: Package Title: Helper Functions to Install and Maintain TeX Live, and Compile LaTeX Documents -Version: 0.54.1 +Version: 0.54.2 Authors@R: c( person("Yihui", "Xie", role = c("aut", "cre", "cph"), email = "xie@yihui.name", comment = c(ORCID = "0000-0003-0645-5666")), person(given = "Posit Software, PBC", role = c("cph", "fnd")), diff --git a/tinytex.Rproj b/tinytex.Rproj index d40b9c5f7..18bb20842 100644 --- a/tinytex.Rproj +++ b/tinytex.Rproj @@ -1,4 +1,5 @@ Version: 1.0 +ProjectId: e10a7696-0e51-49a0-8351-9df9da88574c RestoreWorkspace: Default SaveWorkspace: Default diff --git a/tools/install-bin-unix.sh b/tools/install-bin-unix.sh index 1f9e20b13..0e5667630 100755 --- a/tools/install-bin-unix.sh +++ b/tools/install-bin-unix.sh @@ -38,6 +38,10 @@ rm -rf $TEXDIR if [ -z $TINYTEX_VERSION ]; then TINYTEX_URL="https://github.com/rstudio/tinytex-releases/releases/download/daily/$TINYTEX_INSTALLER" else + # the installer was accidentally named "install-unix" instead of "installer-unix" before v2025.01 + if [ "$TINYTEX_INSTALLER" = "installer-unix" ] && [[ "$TINYTEX_VERSION" -le "2025.01" ]]; then + TINYTEX_INSTALLER="install-unix" + fi TINYTEX_URL="https://github.com/rstudio/tinytex-releases/releases/download/v$TINYTEX_VERSION/$TINYTEX_INSTALLER-v$TINYTEX_VERSION" fi @@ -45,7 +49,7 @@ if [ $OSNAME = 'Darwin' ]; then curl -L -f --retry 10 --retry-delay 30 ${TINYTEX_URL}.tgz -o TinyTeX.tgz tar xf TinyTeX.tgz -C $(dirname $TEXDIR) rm TinyTeX.tgz -else if [ $TINYTEX_INSTALLER != 'installer-unix' ]; then +else if [[ "$TINYTEX_INSTALLER" =~ ^"TinyTeX-" ]]; then wget --retry-connrefused --progress=dot:giga -O TinyTeX.tar.gz ${TINYTEX_URL}.tar.gz tar xf TinyTeX.tar.gz -C $(dirname $TEXDIR) rm TinyTeX.tar.gz