Changeset 2fa79e3b

Timestamp:

10/04/2003 01:47:13 AM (20 years ago)

Author:

Larry Lawrence <larry@…>

Branches:

10.0, 10.1, 11.0, 11.1, 11.2, 11.3, 12.0, 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/inkscape-core-mods, ken/tuningfonts, krejzi/svn, lazarus, lxqt, nosym, perl-modules, plabs/python-mods, qt5new, renodr/vulkan-addition, systemd-11177, systemd-13485, trunk, upgradedb, v5_0, v5_0-pre1, v5_1, v5_1-pre1, xry111/intltool, xry111/soup3, xry111/test-20220226, xry111/xf86-video-removal

Children:

60e14d4

Parents:

b7d0bb4

Message:

applied compressdoc patch

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

File:

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

postlfs/config/compressdoc.xml

@@ -14 +14 @@
 
 #!/bin/bash
+# VERSION: 20031004.0245
 #
 # Compress (with bzip2 or gzip) all man pages in a hierarchy and
-# update symlinks - By Marc Heerdink <marc@koelkast.net>.
+# update symlinks - By Marc Heerdink <marc @ koelkast.net>
 # Modified to be able to gzip or bzip2 files as an option and to deal
-# with all symlinks properly by Mark Hymers # <markh@linuxfromscratch.org>
+# with all symlinks properly by Mark Hymers <markh @ linuxfromscratch.org>
 #
-# Modified 20030925 by Yann E. Morin <yann.morin.1998 @ # anciens.enib.fr>
+# Modified 20030930 by Yann E. Morin <yann.morin.1998 @ anciens.enib.fr>
 # to accept compression/decompression, to correctly handle hard-links,
 # to allow for changing hard-links into soft- ones, to specify the
@@ -27 +28 @@
 #
 # TODO:
-#        - inverse the quiet option into a verbose one, so as to be silent
-#          by default;
 #        - choose a default compress method to be based on the available
 #          tool : gzip or bzip2;
@@ -42 +41 @@
     echo "Unknown option : $1"
   fi
-  echo "Usage: $0 <comp_method> [options] [dirs]"
+  ( echo "Usage: $0 <comp_method> [options] [dirs]" && \
   cat << EOT
 Where comp_method is one of :
@@ -70 +69 @@
                 as the method adds (.bz2 for bzip2, .gz for gzip).
 
-  -s            Change hard-links into soft-links. Use with _caution_ as the
+  --soft, -S    Change hard-links into soft-links. Use with _caution_ as the
                 first encountered file will be used as a reference. Not used
                 when in backup mode.
+
+  --hard, -H    Change soft-links into hard-links. Not used when in backup mode.
 
   --conf=dir, --conf dir
@@ -108 +109 @@
   does not even let me notice this... :-)
 EOT
+) | less
 }
 
@@ -145 +147 @@
 
 # OK, parse the command-line for arguments, and initialize to some sensible
-# state, that is keep hardlinks, parse /etc/man.conf, be most silent, search
-# man.conf in /etc, and don't force (re-)compression.
+# state, that is : don't change links state, parse /etc/man.conf, be most
+# silent, search man.conf in /etc, and don't force (re-)compression.
 COMP_METHOD=
 COMP_SUF=
 COMP_LVL=
-FORCE_COMP=no
+FORCE_OPT=
 LN_OPT=
 MAN_DIR=
@@ -180 +182 @@
       ;;
     --force|-F)
-      FORCE_COMP=yes
-      shift
-      ;;
-    --soft|-s)
-      LN_OPT=-s
+      FORCE_OPT=-F
+      shift
+      ;;
+    --soft|-S)
+      LN_OPT=-S
+      shift
+      ;;
+    --hard|-H)
+      LN_OPT=-H
       shift
       ;;
@@ -276 +282 @@
   echo "Compression level.: $COMP_LVL"
   echo "Compression suffix: $COMP_SUF"
-  echo "Force compression.: $FORCE_COMP"
-  echo "man.conf is.......: ${MAN_CONF}/man.conf ($MAN_CONF)"
-  echo -n "Hard links........: "
-  [ "$LN_OPT" = "-s" -o "$LN_OPT" = "--soft" ] && echo -n "Convert to symlinks" || echo -n "Keep hardlinks"
-  echo " ($LN_OPT)"
+  echo -n "Force compression.: "
+  [ "foo$FORCE_OPT" = "foo-F" ] && echo "yes" || echo "no"
+  echo "man.conf is.......: ${MAN_CONF}/man.conf"
+  echo -n "Hard-links........: "
+  [ "foo$LN_OPT" = "foo-S" ] && echo "convert to soft-links" || echo "leave as is"
+  echo -n "Soft-links........: "
+  [ "foo$LN_OPT" = "foo-H" ] && echo "convert to hard-links" || echo "leave as is"
   echo "Backup............: $BACKUP"
   echo "Faking (yes!).....: $FAKE"
   echo "Directories.......: $MAN_DIR"
-  echo "Silence level.....: $VERBOSE_LVL ($VERBOSE_OPT)"
+  echo "Verbosity level...: $VERBOSE_LVL"
   exit 0
 fi
@@ -310 +318 @@
 # I need to take into account the localized man, so I'm going recursive
 for DIR in $MAN_DIR; do
+  MEM_DIR=`pwd`
   cd "$DIR"
   for FILE in *; do
@@ -322 +331 @@
 
     if [ -d "$FILE" ]; then
+      cd "${MEM_DIR}"  # Go back to where we ran "$0", in case "$0"=="./compressdoc" ...
       # We are going recursive to that directory
       echo "-> Entering ${DIR}/${FILE}..." > $DEST_FD0
       # I need not pass --conf, as I specify the directory to work on
       # But I need exit in case of error
-      "$0" ${COMP_METHOD} ${COMP_LVL} ${LN_OPT} ${VERBOSE_OPT} "${DIR}/${FILE}" || exit 1
+      "$0" ${COMP_METHOD} ${COMP_LVL} ${LN_OPT} ${VERBOSE_OPT} ${FORCE_OPT} "${DIR}/${FILE}" || exit 1
       echo "<- Leaving ${DIR}/${FILE}." > $DEST_FD1
+      cd "$DIR"  # Needed for the next iteration of the loop
 
     else # !dir
@@ -334 +345 @@
       # Check if the file is already compressed with the specified method
       BASE_FILE=`basename \`basename "$FILE" .bz2\` .gz`
-      if [ "${FILE}" = "${BASE_FILE}${COMP_SUF}" -a "${FORCE_COMP}" = "no" ]; then continue; fi
+      if [ "${FILE}" = "${BASE_FILE}${COMP_SUF}" -a "foo${FORCE_OPT}" = "foo" ]; then continue; fi
 
       # If we have a symlink
@@ -356 +367 @@
         fi
 
-        rm -f "$FILE" && ln -s "${LINK}$COMP_SUF" "${FILE}$COMP_SUF"
+        if [ "$LN_OPT" = "-H" ]; then
+          # Change this soft-link into a hard- one
+          rm -f "$FILE" && ln "${LINK}$COMP_SUF" "${FILE}$COMP_SUF"
+          chmod --reference "${LINK}$COMP_SUF" "${FILE}$COMP_SUF"
+        else
+          # Keep this soft-link a soft- one.
+          rm -f "$FILE" && ln -s "${LINK}$COMP_SUF" "${FILE}$COMP_SUF"
+        fi
         echo "Relinked $FILE" > $DEST_FD1
 
@@ -387 +405 @@
         esac
 
-        # Compress the file with the highest compression ratio, if needed
+        # Compress the file with the given compression ratio, if needed
         case $COMP_SUF in
           *bz2)
@@ -406 +424 @@
           for i in $HLINKS; do
             NEWFILE=`echo $i | sed s/\.gz$// | sed s/\.bz2$//`
-            ln ${LN_OPT} "${FILE}$COMP_SUF" "${NEWFILE}$COMP_SUF"
+            if [ "$LN_OPT" = "-S" ]; then
+              # Make this hard-link a soft- one
+              ln -s "${FILE}$COMP_SUF" "${NEWFILE}$COMP_SUF"
+            else
+              # Keep the hard-link a hard- one
+              ln "${FILE}$COMP_SUF" "${NEWFILE}$COMP_SUF"
+            fi
             chmod 644 "${NEWFILE}$COMP_SUF" # Really work only for hard-links. Harmless for soft-links
           done