X-Git-Url: http://git.pld-linux.org/?p=packages%2Frpm.git;a=blobdiff_plain;f=rpm-compress-doc;h=3c5ff93ea3dbbeb3408f594983e21bfceb0fae3c;hp=29b7810aafead2109f800148108e3230fad4aedd;hb=c2b4a49d0168a14f2d094d48d58929482b005254;hpb=5b0f0ac9a55211821b0778001221c01854a2e4d2

diff --git a/rpm-compress-doc b/rpm-compress-doc
index 29b7810..3c5ff93 100644
--- a/rpm-compress-doc
+++ b/rpm-compress-doc
@@ -3,20 +3,35 @@
 # Compress documentation files found in $DOCDIR. Omit some files we don't
 # want to get compressed.
 #
-# $RPM_BUILD_DIR/__rpm_noautocompressdoc can contain whitespace delimated
-# list of patters to ommit.
+# /etc/rpm/noautocompressdoc and --noautocompressdoc= option can contain
+# whitespace delimated list of patters to omit.
 #
 
 #set -x
 
 COMPRESS_CMD="gzip -9nf"
-EXCLUDE_SUFFIXES="htm html jpg jpeg png gif pdf css dia js"
+EXCLUDE_SUFFIXES="htm html jpg jpeg png gif pdf css dia js abw HTM JPG PNG GIF PDF CSS JS"
 EXCLUDE_MASKS=
 RECOMPRESS_BZIP2=yes
 
-if test -f $RPM_BUILD_DIR/__rpm_noautocompressdoc ; then
-	EXCLUDE_MASKS=$(cat $RPM_BUILD_DIR/__rpm_noautocompressdoc | \
-			xargs echo | sed -e 's/^ *//; s/ *$//; s/ \+/|/g')
+nocompressdoc=''
+while [ $# -gt 0 ]; do
+	case "$1" in
+	  --noautocompressdoc=*)
+		EXCLUDE_MASKS=`echo "${1#--noautocompressdoc=}" | sed -e 's/^ *//;s/ *$//;s/ \+/|/g'`
+	esac
+	shift
+done
+
+if [ -r /etc/rpm/noautocompressdoc ]; then
+	exclude=$(cat /etc/rpm/noautocompressdoc | grep -v '^#' | xargs echo | sed -e 's/^ *//;s/ *$//;s/ \+/|/g')
+	if [ -n "${exclude}" ]; then
+		if [ -n "${EXCLUDE_MASKS}" ]; then
+			EXCLUDE_MASKS="${EXCLUDE_MASKS}|${exclude}"
+		else
+			EXCLUDE_MASKS="${exclude}"
+		fi
+	fi
 fi
 
 if [ "$DOCDIR" = "" ] ; then
@@ -46,22 +61,22 @@ eval $FIND_CMD | while read FILENAME ; do
 			continue
 		fi
 	fi
-	case $FILENAME in
+	case "$FILENAME" in
 	*.gz | *.Z)
-		gzip -d $FILENAME
-		FILENAME=$(echo $FILENAME | sed -e 's/\.gz$//; s/\.Z$//')
+		gzip -d "$FILENAME"
+		FILENAME=$(echo "$FILENAME" | sed -e 's/\.gz$//; s/\.Z$//')
 		;;
 	*.bz2)
 		if [ "$RECOMPRESS_BZIP2" = yes ] ; then
-			bzip2 -d $FILENAME
-			FILENAME=$(echo $FILENAME | sed -e 's/\.bz2$//')
+			bzip2 -d "$FILENAME"
+			FILENAME=$(echo "$FILENAME" | sed -e 's/\.bz2$//')
 		else
 			continue
 		fi
 		;;
 	esac
 
-	$COMPRESS_CMD $FILENAME
+	$COMPRESS_CMD "$FILENAME"
 
 	echo -n "$FILENAME "
 done