Changeset 6deeee2

Timestamp:

04/21/2008 07:11:32 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:

48e6b2a

Parents:

cffe62a2

Message:

Fix compressdoc to call the correct script when working recursively

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

Files:

• introduction/welcome/changelog.xml (modified) (1 diff)
• postlfs/config/compressdoc.xml (modified) (3 diffs)

introduction/welcome/changelog.xml

@@ -41 +41 @@
 
 -->
+
+    <listitem>
+      <para>April 21st, 2008</para>
+      <itemizedlist>
+        <listitem>
+          <para>[dnicholson] - Bug fixes for the compressdoc script.</para>
+        </listitem>
+      </itemizedlist>
+    </listitem>
 
     <listitem>

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: 20060311.0028
+# VERSION: 20080421.1112
 #
 # Compress (with bzip2 or gzip) all man pages in a hierarchy and
@@ -58 +58 @@
 # Modified 20060311 by Archaic to use Man-DB manpath utility which is a
 # replacement for man --path from Man.
+#
+# Modified 20080421 by Dan Nicholson to properly execute the correct
+# compressdoc when working recursively. This means the same compressdoc
+# will be used whether a full path was given or it was resolved from PATH.
 #
 # TODO:
@@ -381 +385 @@
 
     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 "-&gt; Entering ${DIR}/${FILE}..." &gt; $DEST_FD0
       # I need not pass --conf, as I specify the directory to work on
-      # But I need exit in case of error
-      "$MY_NAME" ${COMP_METHOD} ${COMP_LVL} ${LN_OPT} ${VERBOSE_OPT} \
-      ${FORCE_OPT} "${DIR}/${FILE}" || exit 1
+      # But I need exit in case of error. We must change back to the
+      # original directory so $0 is resolved correctly.
+      (cd "$MEM_DIR" &amp;&amp; eval "$0" ${COMP_METHOD} ${COMP_LVL} ${LN_OPT} \
+        ${VERBOSE_OPT} ${FORCE_OPT} "${DIR}/${FILE}") || exit $?
       echo "&lt;- Leaving ${DIR}/${FILE}." &gt; $DEST_FD1
-      cd "$DIR"  # Needed for the next iteration of the loop
 
     else # !dir