support new windows / folder

and still win32/ for backward compatibility

.github/workflows/build.yaml

@@ -65,7 +65,7 @@ jobs:
 
       - name: Add TinyTeX to PATH
         run: |
-          echo "$APPDATA\TinyTeX\bin\win32" >> $GITHUB_PATH
+          echo "$APPDATA\TinyTeX\bin\windows" >> $GITHUB_PATH
         shell: bash
 
       - name: Build TinyTeX-0.zip

R/latex.R

@@ -36,7 +36,7 @@
 #' so that \code{latexmk()} knows where to find executables like
 #' \command{pdflatex}. For example, if you are using Windows and your TinyTeX is
 #' on an external drive \file{Z:/} under the folder \file{TinyTeX}, you may set
-#' \code{options(tinytex.tlmgr.path = "Z:/TinyTeX/bin/win32/tlmgr.bat")}.
+#' \code{options(tinytex.tlmgr.path = "Z:/TinyTeX/bin/windows/tlmgr.bat")}.
 #' Usually you should not need to set this option because TinyTeX can add itself
 #' to the \code{PATH} variable during installation or via
 #' \code{\link{use_tinytex}()}. In case both methods fail, you can use this

tools/install-bin-windows.bat

@@ -51,7 +51,7 @@ rd /s /q "%APPDATA%\TinyTeX"
 move /y TinyTeX "%APPDATA%"
 
 echo add tlmgr to PATH
-cd /d "%APPDATA%\TinyTeX\bin\win32"
+cd /d "%APPDATA%\TinyTeX\bin\win*"
 call tlmgr path add
 if /i not "%CI%"=="true" call tlmgr option repository ctan
 call tlmgr postaction install script xetex

tools/install-windows-base.R

@@ -3,7 +3,7 @@
 owd = setwd('tools')
 f = 'install-windows.bat'
 x = readLines(f)
-i = x == r"(call "%APPDATA%\TinyTeX\bin\win32\tlmgr" install %pkgs%)"
+i = x == r"(call tlmgr install %pkgs%)"
 if (sum(i) != 1)
   stop('The script ', f, ' should contain a line to install extra LaTeX packages.')
 x = x[!i]

tools/install-windows.bat

@@ -57,8 +57,10 @@ for /F %%a in (pkgs-custom.txt) do set "pkgs=!pkgs! %%a"
 
 del pkgs-custom.txt
 
-call "%APPDATA%\TinyTeX\bin\win32\tlmgr" conf texmf max_print_line 10000
-call "%APPDATA%\TinyTeX\bin\win32\tlmgr" path add
-call "%APPDATA%\TinyTeX\bin\win32\tlmgr" install %pkgs%
+pushd "%APPDATA%\TinyTeX\bin\win*"
+call tlmgr conf texmf max_print_line 10000
+call tlmgr path add
+call tlmgr install %pkgs%
+popd
 
 pause