commit 38b6ffec0a18bbb3a80357a15c3551b0ec1e33f7
Author: Scott Kostyshak <skost...@lyx.org>
Date:   Sun Mar 16 23:43:33 2025 +0100

    lyx-tester: prep for polyglossia switches of >1 TL
    
    This is the first step to supporting switching between stable and
    dev of polyglossia for multiple TL installations (e.g., 2024 and
    2025).
    
    This commit just cleans up the comments and variables.
---
 development/lyx-tester/switches | 17 ++++++++++-------
 1 file changed, 10 insertions(+), 7 deletions(-)

diff --git a/development/lyx-tester/switches b/development/lyx-tester/switches
index 005bca95e9..8061aea201 100644
--- a/development/lyx-tester/switches
+++ b/development/lyx-tester/switches
@@ -25,15 +25,18 @@ function switch-polyglossia-to-dev ()
   # location of TL version
   polyglossia_tl_f="$(/opt/texbin/kpsewhich polyglossia.sty)"
   polyglossia_tl_d="$(dirname "${polyglossia_tl_f}")"
+  # this is the dir outside of the TL tree where we store the TL polyglossia
+  # dir when we replace it with a symlink to the dev dir.
+  polyglossia_tl_bu_d="/home/$(logname)/polyglossia_tl"
   # check whether link or not link to see whether current is tl or dev.
   if [ -L "${polyglossia_tl_d}" ]; then
     echo "Link exists, so you are already using polyglossia-dev."
     return 0
   else
-    # overwrite polyglossia_tl since newer stable version
-    sudo mv "${polyglossia_tl_d}" "/home/$(logname)/polyglossia_tl"
-    # Use a link to poly-dev. That is, do not copy the directory. That way, we
-    # can just do a git pull.
+    # TODO: need to account for different TL versions.
+    sudo mv "${polyglossia_tl_d}" "${polyglossia_tl_bu_d}"
+    # We use a link to poly-dev. That is, we do not copy the directory. That
+    # way, we can just do a git pull.
     sudo ln -s "${polyglossia_dev_d}/tex" "${polyglossia_tl_d}"
     # we need to check for possibly new/removed files
     sudo /opt/texbin/mktexlsr
@@ -45,12 +48,12 @@ function switch-polyglossia-to-dev ()
 
 function switch-polyglossia-to-stable ()
 {
-  polyglossia_stable_d="/home/$(logname)/polyglossia_tl"
   polyglossia_tl_f="$(/opt/texbin/kpsewhich polyglossia.sty)"
   polyglossia_tl_d="$(dirname "${polyglossia_tl_f}")"
+  polyglossia_tl_bu_d="/home/$(logname)/polyglossia_tl"
   if [ -L "${polyglossia_tl_d}" ]; then
     sudo rm "${polyglossia_tl_d}"
-    sudo mv "${polyglossia_stable_d}" "${polyglossia_tl_d}"
+    sudo mv "${polyglossia_tl_bu_d}" "${polyglossia_tl_d}"
     sudo /opt/texbin/mktexlsr
 
     \sudo -k
@@ -65,9 +68,9 @@ function switch-polyglossia-to-stable ()
 # in a script that updates the TeX Live installation.
 function polyglossia-is-stable ()
 {
-  polyglossia_stable_d="/home/$(logname)/polyglossia_tl"
   polyglossia_tl_f="$(/opt/texbin/kpsewhich polyglossia.sty)"
   polyglossia_tl_d="$(dirname "${polyglossia_tl_f}")"
+  polyglossia_tl_bu_d="/home/$(logname)/polyglossia_tl"
   if [ -L "${polyglossia_tl_d}" ]; then
     # 0 = no, not stable
     echo "0"
-- 
lyx-cvs mailing list
lyx-cvs@lists.lyx.org
https://lists.lyx.org/mailman/listinfo/lyx-cvs

Reply via email to