Changeset 62b2fb0 for postlfs/config

Timestamp:

04/21/2008 10:39:09 PM (16 years ago)

Author:

Dan Nichilson <dnicholson@…>

Branches:

10.0, 10.1, 11.0, 11.1, 11.2, 11.3, 12.0, 12.1, 6.3, 6.3-rc1, 6.3-rc2, 6.3-rc3, 7.10, 7.4, 7.5, 7.6, 7.6-blfs, 7.6-systemd, 7.7, 7.8, 7.9, 8.0, 8.1, 8.2, 8.3, 8.4, 9.0, 9.1, basic, bdubbs/svn, elogind, gnome, kde5-13430, kde5-14269, kde5-14686, kea, ken/TL2024, ken/inkscape-core-mods, ken/tuningfonts, krejzi/svn, lazarus, lxqt, nosym, perl-modules, plabs/newcss, plabs/python-mods, python3.11, qt5new, rahul/power-profiles-daemon, renodr/vulkan-addition, systemd-11177, systemd-13485, trunk, upgradedb, xry111/intltool, xry111/llvm18, xry111/soup3, xry111/test-20220226, xry111/xf86-video-removal

Children:

47aad0c8

Parents:

48e6b2a

Message:

compressdoc: Automatic compression by file size from Lars Bamberger

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

File:

• postlfs/config/compressdoc.xml (modified) (6 diffs)

postlfs/config/compressdoc.xml

@@ -33 +33 @@
 <screen role="root"><?dbfo keep-together="auto"?><userinput>cat &gt; /usr/sbin/compressdoc &lt;&lt; "EOF"
 <literal>#!/bin/bash
-# VERSION: 20080421.1121
+# VERSION: 20080421.1320
 #
 # Compress (with bzip2 or gzip) all man pages in a hierarchy and
@@ -66 +66 @@
 # that don't exist or don't have sufficient permissions.
 #
+# Modified 20080421 by Lars Bamberger to (sort of) automatically choose
+# a compression method based on the size of the manpage. A couple bug
+# fixes were added by Dan Nicholson.
+#
 # TODO:
 #     - choose a default compress method to be based on the available
 #       tool : gzip or bzip2;
-#     - offer an option to automagically choose the best compression
-#       methed on a per page basis (eg. check which of
-#       gzip/bzip2/whatever is the most effective, page per page);
 #     - when a MANPATH env var exists, use this instead of /etc/man_db.conf
 #       (useful for users to (de)compress their man pages;
@@ -89 +90 @@
   --bzip2, --bz2, -b
                 Compress using gzip or bzip2.
+  --automatic
+                Compress using either gzip or bzip2, depending on the
+                size of the file to be compressed. Files larger than 5
+                kB are bzipped, files larger than 1 kB are gzipped and
+                files smaller than 1 kB are not compressed.
 
   --decompress, -d
@@ -217 +223 @@
     --bzip2|--bz2|-b)
       COMP_SUF=.bz2
+      COMP_METHOD=$1
+      shift
+      ;;
+    --automatic)
+      COMP_SUF=TBD
       COMP_METHOD=$1
       shift
@@ -333 +344 @@
   case $COMP_METHOD in
     --bzip2|--bz2|-b) echo -n "bzip2";;
-    --gzip|__gz|-g) echo -n "gzip";;
+    --gzip|--gz|-g) echo -n "gzip";;
+    --automatic) echo -n "compressing";;
     --decompress|-d) echo -n "decompressing";;
     *) echo -n "unknown";;
@@ -416 +428 @@
       if ! check_unique "$DIR" "$FILE"; then continue; fi
 
+      # With automatic compression, get the uncompressed file size of
+      # the file (dereferencing symlinks), and choose an appropriate
+      # compression method.
+      if [ "$COMP_METHOD" = "--automatic" ]; then
+        declare -i SIZE
+        case "$FILE" in
+          *.bz2)
+            SIZE=$(bzcat "$FILE" | wc -c) ;;
+          *.gz)
+            SIZE=$(zcat "$FILE" | wc -c) ;;
+          *)
+            SIZE=$(wc -c &lt; "$FILE") ;;
+        esac
+        if (( $SIZE &gt;= (5 * 2**10) )); then
+          COMP_SUF=.bz2
+        elif (( $SIZE &gt;= (1 * 2**10) )); then
+          COMP_SUF=.gz
+        else
+          COMP_SUF=
+        fi
+      fi
+
       # Check if the file is already compressed with the specified method
       BASE_FILE=`basename "$FILE" .gz`