[blfs-book] r23513 - in trunk/BOOK: introduction/welcome pst/typesetting

[ken--- via blfs-book]

Author: ken
Date: Thu Aug 13 13:29:17 2020
New Revision: 23513

Log:
Tweak texlive instructions -

Do not use let if result might be 0, which silently returns non-zero status
and can break scripts, or if result starts with 0 but is >7 e.g. 08, which
will be treated as octal and visibly report an error.

Modified:
   trunk/BOOK/introduction/welcome/changelog.xml
   trunk/BOOK/pst/typesetting/texlive.xml

Modified: trunk/BOOK/introduction/welcome/changelog.xml
==============================================================================
--- trunk/BOOK/introduction/welcome/changelog.xml       Thu Aug 13 13:11:16 
2020        (r23512)
+++ trunk/BOOK/introduction/welcome/changelog.xml       Thu Aug 13 13:29:17 
2020        (r23513)
@@ -45,6 +45,10 @@
       <para>August 13th, 2020</para>
       <itemizedlist>
         <listitem>
+          <para>[ken] - Tweak the texlive instructions to not report
+          an error from 'let'.</para>
+        </listitem>
+        <listitem>
           <para>[ken] - Use updated patch in qtwebengine to fix build
           with current bison.</para>
         </listitem>

Modified: trunk/BOOK/pst/typesetting/texlive.xml
==============================================================================
--- trunk/BOOK/pst/typesetting/texlive.xml      Thu Aug 13 13:11:16 2020        
(r23512)
+++ trunk/BOOK/pst/typesetting/texlive.xml      Thu Aug 13 13:29:17 2020        
(r23513)
@@ -266,16 +266,28 @@
 
 <!-- on a release, drop this back to current version but update the
  Caution above and ideally keep this commented, every other (expletive
- deleted) poppler update tends to break this. -->
+ deleted) poppler update tends to break this.  Fortunately, upstream
+ has deleted the poppler directory from their source in
+ https://tug.org/svn/texlive?view=revision&revision=55138
+ so from TL2021 this aggravation should be gone. -->
 <screen><userinput>SYSPOP= &amp;&amp;
-let MYPOPPLER_MAJOR=$(pkg-config --modversion poppler | cut -d '.' -f1)
-let MYPOPPLER_MINOR=$(pkg-config --modversion poppler | cut -d '.' -f2)
-if [ "$MYPOPPLER_MAJOR" -eq 0 ] &amp;&amp; [ "$MYPOPPLER_MINOR" -lt 85 ]; then
+MYPOPPLER_MAJOR=$(pkg-config --modversion poppler | cut -d '.' -f1)
+if [ "$MYPOPPLER_MAJOR" = "0" ]; then
+    # if major was >=20, minor could start with 0 and not fit in octal
+    # causing error from 'let' in bash.
+    let MYPOPPLER_MINOR=$(pkg-config --modversion poppler | cut -d '.' -f2)
+else
+    # force a value > 85
+    let MYPOPPLER_MINOR=99
+fi
+if [ "$MYPOPPLER_MINOR" -lt 85 ]; then
     # BLFS-9.1 uses 0.85.0, ignore earlier versions in this script.
+    # If updating texlive on an older system, review the available
+    # variants for pdftoepdf and pdftosrc to use system poppler.
     SYSPOP=
 else
     SYSPOP="--with-system-poppler --with-system-xpdf"
-    if [ "$MYPOPPLER_MAJOR" -eq 0 ] &amp;&amp; [ "$MYPOPPLER_MINOR" -lt 86 ]; 
then
+    if [ "$MYPOPPLER_MINOR" -lt 86 ]; then
         mv -v texk/web2c/pdftexdir/pdftoepdf{-poppler0.83.0,}.cc
     else # 0.86.0 or later, including 20.08.0.
         mv -v texk/web2c/pdftexdir/pdftoepdf{-poppler0.86.0,}.cc
-- 
http://lists.linuxfromscratch.org/listinfo/blfs-book
FAQ: http://www.linuxfromscratch.org/blfs/faq.html
Unsubscribe: See the above information page