X-Git-Url: http://git.pld-linux.org/?p=packages%2Frpm.git;a=blobdiff_plain;f=rpm-find-lang;h=0b5f3c141c4d949edd638ddedc21b1a2bf52e1bc;hp=c195e0e61c4175fc145810c47e5d6b8e43d3389d;hb=4303fdd0dacce8af9e588f14109de186e8e37ed5;hpb=ed4e4dc8f128b2cff753e7be012853f48171a42d

diff --git a/rpm-find-lang b/rpm-find-lang
index c195e0e..0b5f3c1 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
@@ -42,93 +48,165 @@ PACKAGE_NAME.lang unless \$3 is given in which case output is written
 to \$3.
 Additional options:
   --with-gnome		find GNOME help files
-  --with-kde		find KDE help files (not implemented yet)
-  --without-mo		not find locales files
+  --with-kde		find KDE help files
+  --with-omf		find OMF files
+  --all-name		match all package/domain names
+  --without-mo		skip *.mo locale files
 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='#'
+OMF='#'
+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)
+		echo "$PROG: Enabling with KDE"
+		KDE=''
 		shift
 		;;
-	--with-kde )
-		KDE=
+	--with-omf)
+		echo "$PROG: Enabling with OMF"
+		OMF=''
 		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
 done    
 
-find $TOP_DIR -type f|sed '
-1i\
-%defattr (644, root, root, 755)
-s:'"$TOP_DIR"'::
-'"$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:^\$::' > $MO_NAME
-
-find $TOP_DIR -type d|sed '
-s:'"$TOP_DIR"'::
-'"$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:
-'"$ALL_NAME$GNOME"'s:\(.*/gnome/help/[a-zA-Z0-9\_\-]\+$\):%dir \1:
-'"$ALL_NAME$GNOME"'s:\(.*/gnome/help/[a-zA-Z0-9\_\-]\+/[a-zA-Z0-9\_\-]/.\+\)::
-'"$ALL_NAME$GNOME"'s:\(.*/gnome/help/[a-zA-Z0-9\_\-]\+\/\)\([^/]\+\):%lang(\2) \1\2:
-s:%lang(.*) .*/gnome/help/[a-zA-Z0-9\_\-]\+/[a-zA-Z0-9\_\-]\+/.*::
-'#'s:\(.*/gnome/help/'"$NAME"'$\):%dir \1:
-'#'s:\(.*/gnome/help/'"$NAME"'/\)\([^/]\+\):%dir %lang(\2) \1\2:
-s:^\([^%].*\)::
+echo '%defattr(644,root,root,755)' > $MO_NAME
+
+if [ ! -f __find.files ] || [ "$TOP_DIR" -nt __find.files ]; then
+	find $TOP_DIR -xtype f -name '*.mo' | xargs -r file -L | \
+	sed -e '
+		/, 1 messages$/d
+		s/:.*//
+		s:'"$TOP_DIR"'::' > __find.files
+else
+	echo "$PROG: Using cached __find.files"
+fi
+
+if [ ! -f __omf.files ] || [ "$TOP_DIR" -nt __omf.files ]; then
+	find $TOP_DIR -type f -name '*.omf' | \
+	sed -e '
+		s:'"$TOP_DIR"'::' > __omf.files
+else
+	echo "$PROG: Using cached __omf.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:
+/^[^%]/d
 s:%lang(C) ::' >> $MO_NAME
 
-find $TOP_DIR -type d|sed '
-s:'"$TOP_DIR"'::
-'"$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\_\-]\+/\)::
-'"$ALL_NAME$KDE"'s:\(.*/doc/kde/HTML/\)\([^/_]\+\)\(.*/[a-zA-Z0-9\_\-]\+$\):%lang(\2) \1\2\3:
-s:^\([^%].*\)::
+(
+	if [ "$ALL_NAME" ]; then
+		fgrep $NAME __omf.files
+	else
+		cat __omf.files
+	fi
+) | sed '
+'"$ALL_NAME$OMF"'s:\(.*/share/omf/[^/]\+/\)\(.*-\)\([^-]*\)\(\.omf\):%lang(\3) \1\2\3\4:
+'"$NO_ALL_NAME$OMF"'s:\(.*/share/omf/'"$NAME"'/\)\(.*-\)\([^-]*\)\(\.omf\):%lang(\3) \1\2\3\4:
+/^[^%]/d
 s:%lang(C) ::' >> $MO_NAME
 
-if [ "$(cat $MO_NAME | egrep -v '(^%defattr|^$)' | wc -l)" -le 0  ]; then
-        echo 'Error: international files not found !'
-        exit 1
+if [ ! -f __find.dirs ] || [ "$TOP_DIR" -nt __find.dirs ]; then
+	find $TOP_DIR -mindepth 1 -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"'/\)\([^/]\+\)$:%lang(\2) \1\2:
+'"$ALL_NAME$GNOME"'s:\(.*/gnome/help/[^/]\+$\):%dir \1:
+'"$ALL_NAME$GNOME"'s:\(.*/gnome/help/[^/]\+/\)\([^/]\+\)$:%lang(\2) \1\2:
+/^[^%]/d
+s:%lang(C) ::' >> $MO_NAME
+
+(
+	if [ "$ALL_NAME" ]; then
+		fgrep $NAME __find.dirs
+	else
+		cat __find.dirs
+	fi
+) | sed '
+'"$NO_ALL_NAME$KDE"'s:\(.*/doc/kde/HTML/\)\([^/]\+\)\(/'"$NAME"'\)$:%lang(\2) \1\2\3:
+'"$ALL_NAME$KDE"'s:\(.*/doc/kde/HTML/\)\([^/]\+\)\(/[^/]\+\)$:%lang(\2) \1\2\3:
+/^[^%]/d
+s:%lang(C) ::' >> $MO_NAME
+
+(
+	if [ "$ALL_NAME" ]; then
+		fgrep $NAME __find.dirs
+	else
+		cat __find.dirs
+	fi
+) | sed '
+'"$NO_ALL_NAME$OMF"'s:\(.*/share/omf/'"$NAME"'$\):%dir \1:
+'"$ALL_NAME$OMF"'s:\(.*/share/omf/[^/]\+$\):%dir \1:
+/^[^%]/d
+s:%lang(C) ::' >> $MO_NAME
+
+if [ "$(egrep -v '(^%defattr|^$)' $MO_NAME | wc -l)" -le 0 ]; then
+	echo >&2 "Error: international files not found for $NAME!"
+	exit 1
+fi