r7393 - in trunk: BOOK/postlfs/config auxfiles

dnicholson at linuxfromscratch.org dnicholson at linuxfromscratch.org
Mon Apr 21 16:27:43 PDT 2008


Author: dnicholson
Date: 2008-04-21 17:27:43 -0600 (Mon, 21 Apr 2008)
New Revision: 7393

Modified:
   trunk/BOOK/postlfs/config/compressdoc.xml
   trunk/auxfiles/compressdoc
Log:
compressdoc: Compress warnings from manpath(1) when $MANPATH is set


Modified: trunk/BOOK/postlfs/config/compressdoc.xml
===================================================================
--- trunk/BOOK/postlfs/config/compressdoc.xml	2008-04-21 22:39:09 UTC (rev 7392)
+++ trunk/BOOK/postlfs/config/compressdoc.xml	2008-04-21 23:27:43 UTC (rev 7393)
@@ -32,7 +32,7 @@
 
 <screen role="root"><?dbfo keep-together="auto"?><userinput>cat > /usr/sbin/compressdoc << "EOF"
 <literal>#!/bin/bash
-# VERSION: 20080421.1320
+# VERSION: 20080421.1623
 #
 # Compress (with bzip2 or gzip) all man pages in a hierarchy and
 # update symlinks - By Marc Heerdink <marc @ koelkast.net>
@@ -69,11 +69,13 @@
 # a compression method based on the size of the manpage. A couple bug
 # fixes were added by Dan Nicholson.
 #
+# Modified 20080421 by Dan Nicholson to suppress warnings from manpath
+# since these are emitted when $MANPATH is set. Removed the TODO for
+# using the $MANPATH variable since manpath(1) handles this already.
+#
 # TODO:
 #     - choose a default compress method to be based on the available
 #       tool : gzip or bzip2;
-#     - when a MANPATH env var exists, use this instead of /etc/man_db.conf
-#       (useful for users to (de)compress their man pages;
 #     - offer an option to restore a previous backup;
 #     - add other compression engines (compress, zip, etc?). Needed?
 
@@ -316,7 +318,7 @@
 # Note: on my machine, 'man --path' gives /usr/share/man twice, once
 # with a trailing '/', once without.
 if [ -z "$MAN_DIR" ]; then
-  MAN_DIR=`manpath -C "$MAN_CONF"/man_db.conf \
+  MAN_DIR=`manpath -q -C "$MAN_CONF"/man_db.conf \
             | sed 's/:/\\n/g' \
             | while read foo; do dirname "$foo"/.; done \
             | sort -u \

Modified: trunk/auxfiles/compressdoc
===================================================================
--- trunk/auxfiles/compressdoc	2008-04-21 22:39:09 UTC (rev 7392)
+++ trunk/auxfiles/compressdoc	2008-04-21 23:27:43 UTC (rev 7393)
@@ -1,5 +1,5 @@
 #!/bin/bash
-# VERSION: 20080421.1320
+# VERSION: 20080421.1623
 # $LastChangedBy$
 # $Date$
 #
@@ -38,11 +38,13 @@
 # a compression method based on the size of the manpage. A couple bug
 # fixes were added by Dan Nicholson.
 #
+# Modified 20080421 by Dan Nicholson to suppress warnings from manpath
+# since these are emitted when $MANPATH is set. Removed the TODO for
+# using the $MANPATH variable since manpath(1) handles this already.
+#
 # TODO:
 #     - choose a default compress method to be based on the available
 #       tool : gzip or bzip2;
-#     - when a MANPATH env var exists, use this instead of /etc/man_db.conf
-#       (useful for users to (de)compress their man pages;
 #     - offer an option to restore a previous backup;
 #     - add other compression engines (compress, zip, etc?). Needed?
 
@@ -285,7 +287,7 @@
 # Note: on my machine, 'man --path' gives /usr/share/man twice, once
 # with a trailing '/', once without.
 if [ -z "$MAN_DIR" ]; then
-  MAN_DIR=`manpath -C "$MAN_CONF"/man_db.conf \
+  MAN_DIR=`manpath -q -C "$MAN_CONF"/man_db.conf \
             | sed 's/:/\\n/g' \
             | while read foo; do dirname "$foo"/.; done \
             | sort -u \




More information about the blfs-book mailing list