Changeset 39e9093d for pst/typesetting

Timestamp:

08/13/2020 08:29:17 PM (4 years ago)

Author:

Ken Moffat <ken@…>

Branches:

10.0, 10.1, 11.0, 11.1, 11.2, 11.3, 12.0, 12.1, kea, ken/TL2024, ken/inkscape-core-mods, ken/tuningfonts, lazarus, lxqt, plabs/newcss, plabs/python-mods, python3.11, qt5new, rahul/power-profiles-daemon, renodr/vulkan-addition, trunk, upgradedb, xry111/intltool, xry111/llvm18, xry111/soup3, xry111/test-20220226, xry111/xf86-video-removal

Children:

da008f7

Parents:

c18f6acb

Message:

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.

git-svn-id: svn://svn.linuxfromscratch.org/BLFS/trunk/BOOK@23513 af4574ff-66df-0310-9fd7-8a98e5e911e0

File:

• pst/typesetting/texlive.xml (modified) (1 diff)

pst/typesetting/texlive.xml

@@ -267 +267 @@
 <!-- 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.