Changeset b614eb09 for postlfs

Timestamp:

10/09/2003 08:17:25 PM (21 years ago)

Author:

Larry Lawrence <larry@…>

Branches:

10.0, 10.1, 11.0, 11.1, 11.2, 11.3, 12.0, 12.1, 6.0, 6.1, 6.2, 6.2.0, 6.2.0-rc1, 6.2.0-rc2, 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, v5_0, v5_1, v5_1-pre1, xry111/intltool, xry111/llvm18, xry111/soup3, xry111/test-20220226, xry111/xf86-video-removal

Children:

58964bd

Parents:

a78534d

Message:

compressdoc patch, intro expansion

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

File:

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

postlfs/config/compressdoc.xml

@@ -12 +12 @@
 
 <screen><userinput><command>cat &gt; /usr/bin/compressdoc &lt;&lt; "EOF"</command>
-
 #!/bin/bash
-# VERSION: 20031004.0245
+# VERSION: 20031009.1920
 #
 # Compress (with bzip2 or gzip) all man pages in a hierarchy and
@@ -129 +128 @@
   BASENAME=`basename "${2}" .bz2`
   BASENAME=`basename "${BASENAME}" .gz`
-  LIST=
-  [ -f "$DIR"/"${BASENAME}" -o -L "$DIR"/"${BASENAME}" ] &amp;&amp; LIST="${LIST} ${BASENAME}"
-  [ -f "$DIR"/"${BASENAME}".gz -o -L "$DIR"/"${BASENAME}".gz ] &amp;&amp; LIST="${LIST} ${BASENAME}.gz"
-  [ -f "$DIR"/"${BASENAME}".bz2 -o -L "$DIR"/"${BASENAME}".bz2 ] &amp;&amp; LIST="${LIST} ${BASENAME}.bz2"
+  GZ_FILE="$BASENAME".bz2
+  BZ_FILE="$BASENAME".bz2
 
   # Look for, and keep, the most recent one
-  LATEST=`(cd "$DIR"; ls -1rt $LIST | tail -1)`
-  for i in $LIST; do
+  LATEST=`(cd "$DIR"; ls -1rt "${BASENAME}" "${GZ_FILE}" "${BZ_FILE}" 2&gt;/dev/null | tail -1)`
+  for i in "${BASENAME}" "${GZ_FILE}".gz "${BZ_FILE}".bz2; do
     [ "$LATEST" != "$i" ] &amp;&amp; rm -f "$DIR"/"$i"
   done
@@ -344 +341 @@
 
       # Check if the file is already compressed with the specified method
-      BASE_FILE=`basename \`basename "$FILE" .bz2\` .gz`
+      BASE_FILE=`basename "$FILE" .gz`
+      BASE_FILE=`basename "$FILE" .bz2`
       if [ "${FILE}" = "${BASE_FILE}${COMP_SUF}" -a "foo${FORCE_OPT}" = "foo" ]; then continue; fi
 
       # If we have a symlink
       if [ -h "$FILE" ]; then
-        case $FILE in
+        case "$FILE" in
           *.bz2)
             EXT=bz2 ;;
@@ -359 +357 @@
 
         if [ ! "$EXT" = "none" ]; then
-          LINK=`ls -l $FILE | cut -d "&gt;" -f2 | tr -d " " | sed s/\.$EXT$//`
+          LINK=`ls -l "$FILE" | cut -d "&gt;" -f2 | tr -d " " | sed s/\.$EXT$//`
           NEWNAME=`echo "$FILE" | sed s/\.$EXT$//`
           mv "$FILE" "$NEWNAME"
           FILE="$NEWNAME"
         else
-          LINK=`ls -l $FILE | cut -d "&gt;" -f2 | tr -d " "`
+          LINK=`ls -l "$FILE" | cut -d "&gt;" -f2 | tr -d " "`
         fi
 
@@ -394 +392 @@
         # We do decompress first to re-compress with the selected
         # compression ratio later on...
-        case $FILE in
+        case "$FILE" in
           *.bz2)
             bunzip2 $FILE
@@ -423 +421 @@
         if [ -n "$HLINKS" ]; then
           for i in $HLINKS; do
-            NEWFILE=`echo $i | sed s/\.gz$// | sed s/\.bz2$//`
+            NEWFILE=`echo "$i" | sed s/\.gz$// | sed s/\.bz2$//`
             if [ "$LN_OPT" = "-S" ]; then
               # Make this hard-link a soft- one
@@ -439 +437 @@
         # Obviously, we shall never ever come here... :-(
         echo "Whaooo... \"${DIR}/${FILE}\" is neither a symlink nor a plain file. Please check:"
-        ls -l ${DIR}/${FILE}
+        ls -l "${DIR}/${FILE}"
         exit 1
       fi