X-Git-Url: http://git.pld-linux.org/?a=blobdiff_plain;f=rpm-find-lang;h=9780aa49cc01079c3ad678d793e4d192a208be65;hb=e51b27b987440eb253c371365db21b9cb4f00070;hp=e1293fbadd5194796794c9003a1c83f27b76d9ad;hpb=e9d9f381f5047096db95418e47351b485c4162ad;p=packages%2Frpm.git

diff --git a/rpm-find-lang b/rpm-find-lang
index e1293fb..9780aa4 100644
--- a/rpm-find-lang
+++ b/rpm-find-lang
@@ -13,6 +13,10 @@
 
 #changes:
 # $Id$
+# 2006-08-28 Elan Ruusamäe <glen@pld-linux.org>
+#   * fixed --all-name which got broken with last change.
+# 2006-08-09 Elan Ruusamäe <glen@pld-linux.org>
+#   * huge performance boost for packages calling %find_lang multiple times (kde*i18n)
 # 2001-01-08 Micha³ Kochanowicz <mkochano@pld.org.pl>
 #   * --all-name support for KDE.
 # 2000-11-28 Rafa³ Cygnarowski <pascalek@pld.org.pl>
@@ -28,10 +32,12 @@
 #   * added support for GNOME help files
 #   * start support for KDE help files
 
+PROG=${0##*/}
+
 usage () {
 cat <<EOF
 
-Usage: $0 TOP_DIR PACKAGE_NAME [prefix]
+Usage: $PROG TOP_DIR PACKAGE_NAME [prefix]
 
 where TOP_DIR is
 the top of the tree containing the files to be processed--should be
@@ -49,47 +55,57 @@ EOF
 exit 1
 }
 
-if [ -z "$1" ] ; then usage
-elif [ $1 = / ] ; then echo $0: expects non-/ argument for '$1' 1>&2
-elif [ ! -d $1 ] ; then
- echo $0: $1: no such directory
- exit 1
-else TOP_DIR="`echo $1|sed -e 's:/$::'`"
+if [ -z "$1" ]; then
+	usage
+elif [ $1 = / ]; then
+	echo >&2 "$PROG: expects non-/ argument for '$1'"
+	exit 1
+elif [ ! -d $1 ]; then
+	echo >&2 "$PROG: $1: No such directory"
+	exit 1
+else
+	TOP_DIR="${1%/}"
 fi
 shift
 
-if [ -z "$1" ] ; then usage
-else NAME=$1
+if [ -z "$1" ]; then
+   	usage
+else
+   	NAME=$1
 fi
 shift
 
-GNOME=#
-KDE=#
-MO=
+GNOME='#'
+KDE='#'
+MO=''
 MO_NAME=$NAME.lang
-ALL_NAME=#
-NO_ALL_NAME=
+ALL_NAME='#'
+NO_ALL_NAME=''
 while test $# -gt 0 ; do
-    case "${1}" in
-	--with-gnome )
-  		GNOME=
+    case "$1" in
+	--with-gnome)
+  		GNOME=''
+		echo "$PROG: Enabling with GNOME"
 		shift
 		;;
-	--with-kde )
-		KDE=
+	--with-kde)
+		echo "$PROG: Enabling with KDE"
+		KDE=''
 		shift
 		;;
-	--without-mo )
-		MO=#
+	--without-mo)
+		echo "$PROG: Disabling .mo files"
+		MO='#'
 		shift
 		;;
-	--all-name )
-		ALL_NAME=
-		NO_ALL_NAME=#
+	--all-name)
+		echo "$PROG: Enabling with all names"
+		ALL_NAME=''
+		NO_ALL_NAME='#'
 		shift
 		;;
 	* )
-		MO_NAME=${1}
+		MO_NAME=$1
 		shift
 		;;
     esac
@@ -97,18 +113,41 @@ done
 
 echo '%defattr(644,root,root,755)' > $MO_NAME
 
-find $TOP_DIR -type f -name \*.mo | xargs -r file | egrep -v ', 1 messages$' |\
-sed '
-s/:.*//
-s:'"$TOP_DIR"'::
+if [ ! -f __find.files ] || [ "$TOP_DIR" -nt __find.files ]; then
+	find $TOP_DIR -type f -name '*.mo' | xargs -r file | egrep -v ', 1 messages$' | \
+	sed -e '
+		s/:.*//
+		s:'"$TOP_DIR"'::' > __find.files
+else
+	echo "$PROG: Using cached __find.files"
+fi
+
+(
+	if [ "$ALL_NAME" ]; then
+		fgrep $NAME __find.files
+	else
+		cat __find.files
+	fi
+) | sed '
 '"$ALL_NAME$MO"'s:\(.*/share/locale/\)\([^/_]\+\)\(.*\.mo$\):%lang(\2) \1\2\3:
 '"$NO_ALL_NAME$MO"'s:\(.*/share/locale/\)\([^/]\+\)\(.*/'"$NAME"'\.mo$\):%lang(\2) \1\2\3:
 s:^\([^%].*\)::
 s:%lang(C) ::
 s:^\$::' | egrep -v '^$' >> $MO_NAME
 
-find $TOP_DIR -type d|sed '
-s:'"$TOP_DIR"'::
+if [ ! -f __find.dirs ] || [ "$TOP_DIR" -nt __find.dirs ]; then
+	find $TOP_DIR -type d | sed 's:'"$TOP_DIR"'::' > __find.dirs
+else
+	echo "$PROG: Using cached __find.dirs"
+fi
+
+(
+	if [ "$ALL_NAME" ]; then
+		fgrep $NAME __find.dirs
+	else
+		cat __find.dirs
+	fi
+) | sed '
 '"$NO_ALL_NAME$GNOME"'s:\(.*/gnome/help/'"$NAME"'$\):%dir \1:
 '"$NO_ALL_NAME$GNOME"'s:\(.*/gnome/help/'"$NAME"'/[a-zA-Z0-9.\_\-]/.\+\)::
 '"$NO_ALL_NAME$GNOME"'s:\(.*/gnome/help/'"$NAME"'\/\)\([^/]\+\):%lang(\2) \1\2:
@@ -119,8 +158,13 @@ s:%lang(.*) .*/gnome/help/[a-zA-Z0-9.\_\-]\+/[a-zA-Z0-9.\_\-]\+/.*::
 s:^\([^%].*\)::
 s:%lang(C) ::' | egrep -v '^$' >> $MO_NAME
 
-find $TOP_DIR -type d|sed '
-s:'"$TOP_DIR"'::
+(
+	if [ "$ALL_NAME" ]; then
+		fgrep $NAME __find.dirs
+	else
+		cat __find.dirs
+	fi
+) | sed '
 '"$NO_ALL_NAME$KDE"'s:\(.*/doc/kde/HTML/\)\([^/_]\+\)\(.*/'"$NAME"'/\)::
 '"$NO_ALL_NAME$KDE"'s:\(.*/doc/kde/HTML/\)\([^/_]\+\)\(.*/'"$NAME"'\)$:%lang(\2) \1\2\3:
 '"$ALL_NAME$KDE"'s:\(.*/doc/kde/HTML/\)\([^/_]\+\)\(.*/[a-zA-Z0-9.\_\-]\+/\)::
@@ -128,8 +172,7 @@ s:'"$TOP_DIR"'::
 s:^\([^%].*\)::
 s:%lang(C) ::' | egrep -v '^$' >> $MO_NAME
 
-if [ "$(cat $MO_NAME | egrep -v '(^%defattr|^$)' | wc -l)" -le 0  ]; then
-        echo 'Error: international files not found !'
-        exit 1
+if [ "$(egrep -v '(^%defattr|^$)' $MO_NAME | wc -l)" -le 0 ]; then
+	echo >&2 "Error: international files not found for $NAME!"
+	exit 1
 fi
-