From ccfb8d41ad851432e73a82b486a29707d0faa405 Mon Sep 17 00:00:00 2001
From: Mohammad Akhlaghi <mohammad@akhlaghi.org>
Date: Sat, 1 Dec 2018 01:30:26 +0000
Subject: Improved TeXLive installation checks
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Thanks to the check by Cristina Martínez, some corrections were made when
we attempt to download and install TeXLive. Further checks and corrections
will be in due time.
---
 configure | 13 ++++++-------
 1 file changed, 6 insertions(+), 7 deletions(-)

(limited to 'configure')

diff --git a/configure b/configure
index b39d825..c3c11f7 100755
--- a/configure
+++ b/configure
@@ -636,9 +636,8 @@ numthreads=$($instdir/bin/nproc)
 # it. It will just stop at the stage when all the processing is complete
 # and it is only necessary to build the PDF.  So we don't want to stop the
 # pipeline if its not present.
-if ! [ -f  $instdir/bin/texlive-ready ]; then
-    $instdir/bin/texlive-ready-tlmgr
-    rm -rf $instdir/texlive
+texlive_result=$(cat $instdir/bin/texlive-ready-tlmgr)
+if [ x$texlive_result = x"NOT!" ]; then
     cat <<EOF
 
 !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
@@ -646,9 +645,9 @@ if ! [ -f  $instdir/bin/texlive-ready ]; then
 !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
 
 TeX Live couldn't be installed during the configuration (probably because
-there was no internet). TeX Live is only necessary in making the final PDF
-(which is only done after all the analysis has been complete). It is not
-used at all during the analysis.
+there were downloading problems). TeX Live is only necessary in making the
+final PDF (which is only done after all the analysis has been complete). It
+is not used at all during the analysis.
 
 Therefore, if you don't need the final PDF, and just want to do the
 analysis, you can safely ignore this warning and continue.
@@ -658,7 +657,7 @@ pipeline, please delete the respective files, then re-run configure as
 shown below. Within configure, answer 'n' (for "no") when asked to re-write
 the configuration files.
 
-    rm .local/bin/texlive-ready-*
+    rm .local/bin/texlive-ready-tlmgr
     ./configure
 
 !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
-- 
cgit v1.2.1