1 files changed, 23 insertions, 18 deletions

diff --git a/tl-build.sh b/tl-build.sh
index 5cef9a1..eda6bea 100755
--- a/tl-build.sh
+++ b/tl-build.sh
@@ -4,7 +4,10 @@
 
 this_dir=`pwd`
 tl_sourcedir=${this_dir}/source
-    
+if [[ -e $1 ]];then
+. ${this_dir}/variables.conf
+fi
+
 echo ""
 echo "            TeX Live for OpenBSD built script                "
 echo ""
@@ -24,13 +27,8 @@ read with_clisp?'[y/n] '
 enable_xindy=""
 
 # Context
-preset_context_ver=2.11.02
-echo "Include Context v${preset_context_ver}?"
+echo "Include Context?"
 read with_context?'[y/n] '
-if [[ ${with_context} == "y" ]]; then
-    context_ver=${preset_context_ver}
-fi
-unset preset_context_ver
 
 # Asymptote
 echo "Include Asymptote?"
@@ -43,13 +41,14 @@ read build_tl?'[y/n] '
 # First build: clisp
 if [[ ${with_clisp} == "y" ]]; then
     mkdir $tl_sourcedir/clisp && cd $tl_sourcedir/clisp
+    utils_README=$tl_sourcedir/utils/README
     clisp_basedir=`pwd`
     clisp_toolsdir=$clisp_basedir/clisp-tools
     clisp_builddir=$clisp_basedir/clisp-build
     mkdir $clisp_toolsdir
     wget=wget  # or "curl -O" or whatever
     #libsigsegv_ver=libsigsegv-2.13
-    libsigsegv_ver=$(curl -s https://tug.org/svn/texlive/trunk/Build/source/utils/README?view=co | grep libsigsegv_ver= | sed 's/.*=//')
+    libsigsegv_ver=$(cat ${utils_README} | grep libsigsegv_ver= | sed 's/.*=//')
     cd $clisp_basedir
     $wget http://ftp.gnu.org/gnu/libsigsegv/$libsigsegv_ver.tar.gz
     gzip -dc $libsigsegv_ver.tar.gz | tar xf -
@@ -58,7 +57,7 @@ if [[ ${with_clisp} == "y" ]]; then
         && make && make check && make install
     # iconv
     #libiconv_ver=libiconv-1.16
-    libiconv_ver=$(curl -s https://tug.org/svn/texlive/trunk/Build/source/utils/README?view=co | grep libiconv_ver= | sed 's/.*=//')
+    libiconv_ver=$(cat ${utils_README} | grep libiconv_ver= | sed 's/.*=//')
     cd $clisp_basedir
     $wget http://ftp.gnu.org/gnu/libiconv/$libiconv_ver.tar.gz
     gzip -dc $libiconv_ver.tar.gz | tar xf -
@@ -68,7 +67,7 @@ if [[ ${with_clisp} == "y" ]]; then
         && make && make check && make install
     
     #clisp_ver=clisp-2.49.92
-    clisp_ver=$(curl -s https://tug.org/svn/texlive/trunk/Build/source/utils/README?view=co | grep clisp_ver= | sed 's/.*=//')
+    clisp_ver=$(cat ${utils_README} | grep clisp_ver= | sed 's/.*=//')
     cd $clisp_basedir
     $wget https://alpha.gnu.org/gnu/clisp/$clisp_ver.tar.bz2
     bunzip2 -dc $clisp_ver.tar.bz2 | tar xf -
@@ -87,15 +86,21 @@ fi
 # If Context is required, then retrieve and build it first
 if [[ ${with_context} == "y" ]]; then
     cd $tl_sourcedir
-    # github may be outdated, says the readme file
-    # curl -L https://github.com/contextgarden/luametatex/archive/refs/tags/v$context_ver.tar.gz > luametatex-$context_ver.tar.gz
-    # tar xzf luametatex-$context_ver.tar.gz
-    # cd luametatex-$context_ver
-    if [[ -d luametatex ]];then
-        rm -f luametatex-{$context_ver}.tar.xz
-        rm -rf luametatex
+    if [[ -e $1 ]];then
+        context_ver=$(svn list svn://tug.org/texlive/branches/branch2024/Master/source | grep luametatex-.*xz | sed 's/.*-\(.*\).tar.xz/\1/')
+        if [[ -d luametatex ]];then
+            rm -f luametatex-{$context_ver}.tar.xz
+            rm -rf luametatex
+        fi
+        svn export svn://tug.org/texlive/branches/branch2024/Master/source/luametatex-${context_ver}.tar.xz
+    else
+        context_ver=$(svn list svn://tug.org/texlive/trunk/Master/source | grep luametatex-.*xz | sed 's/.*-\(.*\).tar.xz/\1/')
+        if [[ -d luametatex ]];then
+            rm -f luametatex-{$context_ver}.tar.xz
+            rm -rf luametatex
+        fi
+        svn export svn://tug.org/texlive/trunk/Master/source/luametatex-${context_ver}.tar.xz
     fi
-    rsync tug.org::tldevsrc/Master/source/luametatex-$context_ver.tar.xz .
     xzcat luametatex-$context_ver.tar.xz | tar xf -
     luametatex_src_dir=$(xzcat luametatex-$context_ver.tar.xz | tar tf - | head -1)
     cd ${luametatex_src_dir}