better include an option to compile either TL-current (default) or TL-dev

2 files changed, 18 insertions, 21 deletions

diff --git a/checkout-tl.sh b/checkout-tl.sh
index 41caac4..4d42437 100755
--- a/checkout-tl.sh
+++ b/checkout-tl.sh
@@ -1,19 +1,12 @@
 #!/bin/sh
-#rsync -a --delete --exclude=.svn tug.org::tldevsrc/Build/source .
-PWD=`pwd`
-REV=70573
-if [[ ! -d source ]];then
-    svn co svn://tug.org/texlive/trunk/Build/source@${REV}
+if [[ $1 == "dev"  ]];then
+    rsync -a --delete --exclude=.svn tug.org::tldevsrc/Build/source .
 else
-    cd source
-    svn update -r ${REV}
-    if [[ $? -ne 0 ]];then
-        echo "Please remove or rename the source/ directory"
-        echo "and re-run this command."
-        exit 1
-    fi
-    svn revert --recursive .
-    svn status --no-ignore | grep '^[?I]' |  sed "s/^[?I] //" \
-        | xargs -I{} rm -rf "{}"
+    # source variables
+    PWD=$(pwd)
+    TMPDIR=$(mktemp -d)
+    . ${PWD}/variables.conf
+    [[ -d "texlive-${TL_PUBDATE}-source" ]] && rm -rf texlive-${TL_PUBDATE}-source 
+    wget --show-progress https://mirrors.ctan.org/systems/texlive/Source/texlive-${TL_PUBDATE}-source.tar.xz -P ${TMPDIR}/
+    xzcat ${TMPDIR}/texlive-${TL_PUBDATE}-source.tar.xz | tar xf -
 fi
-cd ${PWD}
diff --git a/tl-build.sh b/tl-build.sh
index 1d47095..b6260a0 100755
--- a/tl-build.sh
+++ b/tl-build.sh
@@ -3,8 +3,13 @@
 # Public domain.  Originally written 2005 by Karl Berry.
 
 this_dir=`pwd`
-tl_sourcedir=`pwd`/source
-
+if [[ $1 == "dev" ]];then
+    tl_sourcedir=${this_dir}/source
+else
+    . ${this_dir}/variables.conf
+    tl_sourcedir=${this_dir}/texlive-${TL_PUBDATE}-source
+fi
+    
 echo ""
 echo "            TeX Live for OpenBSD built script                "
 echo ""
@@ -13,11 +18,10 @@ echo "Please specify whether you also want to include xindy, context"
 echo "and asymptote in the process."
 echo ""
 
-echo "Do I have to get the latest development sources?  (You ought to"
-echo "have done so before launching this script.)"
+echo "Do I have to get the sources?  (You ought to have done so before launching this script.)"
 read get_dev_src?'[y/n] '
 if [[ ${get_dev_src} == "y" ]]; then
-    ./checkout-tl.sh && echo "... Ok."
+    ./checkout-tl.sh $1 && echo "... Ok."
 fi
 
 echo "Include clisp and xindy?"