From d868c99c5ed3cd5a90b64110a757976446294e5b Mon Sep 17 00:00:00 2001
From: MLopez-Ibanez <2620021+MLopez-Ibanez@users.noreply.github.com>
Date: Thu, 28 Sep 2023 17:44:35 +0100
Subject: [PATCH] fixup

---
 .github/texlive/texlive.profile        | 10 --------
 .github/texlive/texlive_install.sh     | 34 --------------------------
 .github/{texlive => }/texlive_packages |  0
 .github/workflows/test-and-deploy.yml  | 10 +++-----
 4 files changed, 4 insertions(+), 50 deletions(-)
 delete mode 100644 .github/texlive/texlive.profile
 delete mode 100755 .github/texlive/texlive_install.sh
 rename .github/{texlive => }/texlive_packages (100%)

diff --git a/.github/texlive/texlive.profile b/.github/texlive/texlive.profile
deleted file mode 100644
index ef71dd96..00000000
--- a/.github/texlive/texlive.profile
+++ /dev/null
@@ -1,10 +0,0 @@
-selected_scheme scheme-basic
-TEXDIR /tmp/texlive
-TEXMFCONFIG ~/.texlive/texmf-config
-TEXMFHOME ~/texmf
-TEXMFLOCAL /tmp/texlive/texmf-local
-TEXMFSYSCONFIG /tmp/texlive/texmf-config
-TEXMFSYSVAR /tmp/texlive/texmf-var
-TEXMFVAR ~/.texlive/texmf-var
-option_doc 0
-option_src 0
diff --git a/.github/texlive/texlive_install.sh b/.github/texlive/texlive_install.sh
deleted file mode 100755
index 2a2d6df1..00000000
--- a/.github/texlive/texlive_install.sh
+++ /dev/null
@@ -1,34 +0,0 @@
-#!/usr/bin/env sh
-
-# Originally from https://github.com/latex3/latex3/blob/master/support/texlive.sh
-texlive_root=./.github/texlive
-texlive_profile="${texlive_root}/texlive.profile"
-
-export PATH=/tmp/texlive/bin/x86_64-linux:$PATH
-if ! command -v pdflatex > /dev/null; then
-     echo "Texlive not installed"
-     echo "Downloading texlive and installing"
-     wget http://mirror.ctan.org/systems/texlive/tlnet/install-tl-unx.tar.gz
-     tar -xzf install-tl-unx.tar.gz
-     # Install a minimal system
-     if [ ! -r "$texlive_profile" ]; then
-         echo "error: $texlive_profile"
-         exit 1
-     fi
-     ./install-tl-*/install-tl --profile="$texlive_profile"
-     echo "Finished installing TexLive"
- fi
-
-echo "Updating TexLive"
-# Keep no backups (not required, simply makes cache bigger)
-tlmgr option -- autobackup 0
-echo "Updating tlmgr itself"
-tlmgr update --self
-
-echo "Install ${texlive_root}/texlive_packages"
-tlmgr install $(sed 's/\s*#.*//;/^\s*$/d' ${texlive_root}/texlive_packages)
-
-echo "Update the TL install but add nothing new"
-tlmgr update --self --all --no-auto-install
-
-echo "Finished texlive_install.sh"
diff --git a/.github/texlive/texlive_packages b/.github/texlive_packages
similarity index 100%
rename from .github/texlive/texlive_packages
rename to .github/texlive_packages
diff --git a/.github/workflows/test-and-deploy.yml b/.github/workflows/test-and-deploy.yml
index 991e4719..f3514ad2 100644
--- a/.github/workflows/test-and-deploy.yml
+++ b/.github/workflows/test-and-deploy.yml
@@ -76,21 +76,19 @@ jobs:
       - name: Install additional LaTeX packages
         if: ${{ env.FILES_CHANGED != 0 && steps.cache-tinytex.outputs.cache-hit != 'true'}}
         run: |
-          texlive_root=./.github/texlive
+          texlive_packages=./.github/texlive_packages
           echo "Updating TexLive"
           # Keep no backups (not required, simply makes cache bigger)
           tlmgr option -- autobackup 0
           echo "Updating tlmgr itself"
           tlmgr update --self
-          echo "Install ${texlive_root}/texlive_packages"
-          tlmgr install $(sed 's/\s*#.*//;/^\s*$/d' "${texlive_root}/texlive_packages")
+          echo "Install ${texlive_packages}"
+          tlmgr install $(sed 's/\s*#.*//;/^\s*$/d' "${texlive_packages}")
           tlmgr path add
-          #echo $PATH
-          #echo "PATH=$PATH:$HOME/bin:$HOME/.local/bin" >> $GITHUB_ENV
           
       - name: Run test
         if: ${{ success() && env.FILES_CHANGED != 0 }}
-        run: echo $PATH && cd test && ./test.sh
+        run: cd test && ./test.sh
 
       - name: Compress PDFs
         if: ${{ success() && env.FILES_CHANGED != 0 }}