Changeset 7ae9774 for BLFS/gen_pkg_book.sh

Timestamp:

12/16/2021 12:57:01 PM (3 years ago)

Author:

Pierre Labastie <pierre.labastie@…>

Branches:

ablfs-more, legacy, trunk

Children:

dd9ca56

Parents:

b8e5cad

Message:

Fix the logic for -pass1 packages in gen_pkg_book

File:

• BLFS/gen_pkg_book.sh (modified) (1 diff)

BLFS/gen_pkg_book.sh

@@ -208 +208 @@
 LIST=
 while read p; do
-    p=${p%-pass1}
-    versions=$(xsltproc --stringparam package "$p" $GetVersion $PackFile)
+    if [ "$p" != "${p%-pass1}" ]; then
+# If the pass2 is installed, no need for pass1. We get its
+# installed version from TRACKFILE; We could use PackFile, but
+# the test would be slightly more complicated.
+echo Treating $p
+        pass2_v=$(xsltproc --stringparam package "${p%-pass1}" \
+                  $GetVersion $TRACKFILE | head -n1)
+echo Found pass2_v=$pass2_v
+        if [ -n "$pass2_v" ]; then continue; fi
+# We need to get the installed version from TRACKFILE
+        inst_v=$(xsltproc --stringparam package "$p" $GetVersion $TRACKFILE | \
+                 head -n1)
+        if [ -z "$inst_v" ]; then inst_v=0; fi
+echo Found inst_v=$inst_v
+# The available version is taken from PackFile
+        avail_v=$(xsltproc --stringparam package "${p%-pass1}" \
+                  $GetVersion $PackFile | head -n1)
+echo Found avail_v=$avail_v
+        versions="$avail_v
+$inst_v"
+        echo which gives versions=$versions
+    else
+        versions=$(xsltproc --stringparam package "$p" $GetVersion $PackFile)
+    fi
     if [ "$versions" != "$(sort -V <<<$versions)" ]; then
         LIST="$LIST $p"