X-Git-Url: http://git.pld-linux.org/?a=blobdiff_plain;f=rpm-find-lang;h=9c586ed58d9073ada3de4d432fa46b647a5d4072;hb=c6bb8dfeef4e1072934c96855eb4472ac5aa1892;hp=62d6937838312f5aa96668ebdc2fb8616d633ffb;hpb=e253ab57f415356b7b600167e9d01e1981044bcf;p=packages%2Frpm.git

diff --git a/rpm-find-lang b/rpm-find-lang
index 62d6937..9c586ed 100644
--- a/rpm-find-lang
+++ b/rpm-find-lang
@@ -13,6 +13,8 @@
 
 #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>
@@ -30,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
@@ -45,6 +49,7 @@ to \$3.
 Additional options:
   --with-gnome		find GNOME help 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
@@ -54,9 +59,10 @@ exit 1
 if [ -z "$1" ]; then
 	usage
 elif [ $1 = / ]; then
-	echo >&2 "$0: expects non-/ argument for '$1'"
+	echo >&2 "$PROG: expects non-/ argument for '$1'"
+	exit 1
 elif [ ! -d $1 ]; then
-	echo "$0: $1: no such directory"
+	echo >&2 "$PROG: $1: No such directory"
 	exit 1
 else
 	TOP_DIR="${1%/}"
@@ -72,6 +78,7 @@ shift
 
 GNOME='#'
 KDE='#'
+OMF='#'
 MO=''
 MO_NAME=$NAME.lang
 ALL_NAME='#'
@@ -80,17 +87,26 @@ while test $# -gt 0 ; do
     case "$1" in
 	--with-gnome)
   		GNOME=''
+		echo "$PROG: Enabling with GNOME"
 		shift
 		;;
 	--with-kde)
+		echo "$PROG: Enabling with KDE"
 		KDE=''
 		shift
 		;;
+	--with-omf)
+		echo "$PROG: Enabling with OMF"
+		OMF=''
+		shift
+		;;
 	--without-mo)
+		echo "$PROG: Disabling .mo files"
 		MO='#'
 		shift
 		;;
 	--all-name)
+		echo "$PROG: Enabling with all names"
 		ALL_NAME=''
 		NO_ALL_NAME='#'
 		shift
@@ -104,24 +120,62 @@ done
 
 echo '%defattr(644,root,root,755)' > $MO_NAME
 
-if [ ! -f __find.files ]; then
+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 [ ! -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
 
-fgrep $NAME __find.files | sed '
+(
+	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
 
-if [ ! -f __find.dirs ]; then
+(
+	if [ "$ALL_NAME" ]; then
+		fgrep $NAME __omf.files
+	else
+		cat __omf.files
+	fi
+) | sed '
+'"$ALL_NAME$OMF"'s:\(.*/omf/[a-zA-Z0-9.\_\-]\+\)\(.*\-\)\(.*\)\(.*\.omf\):%lang(\3) \1\2\3\4:
+'"$NO_ALL_NAME$OMF"'s:\(.*/omf/'"$NAME"'\)\(.*\-\)\(.*\)\(.*\.omf\):%lang(\3) \1\2\3\4:
+s:^\([^%].*\)::
+s:%lang(C) ::
+s:^\$::' | egrep -v '^$' >> $MO_NAME
+
+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
-fgrep $NAME __find.dirs | sed '
+
+(
+	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:
@@ -132,7 +186,13 @@ s:%lang(.*) .*/gnome/help/[a-zA-Z0-9.\_\-]\+/[a-zA-Z0-9.\_\-]\+/.*::
 s:^\([^%].*\)::
 s:%lang(C) ::' | egrep -v '^$' >> $MO_NAME
 
-fgrep $NAME __find.dirs | sed '
+(
+	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.\_\-]\+/\)::
@@ -140,7 +200,19 @@ fgrep $NAME __find.dirs | sed '
 s:^\([^%].*\)::
 s:%lang(C) ::' | egrep -v '^$' >> $MO_NAME
 
+(
+	if [ "$ALL_NAME" ]; then
+		fgrep $NAME __find.dirs
+	else
+		cat __find.dirs
+	fi
+) | sed '
+'"$NO_ALL_NAME$OMF"'s:\(.*/omf/'"$NAME"'$\):%dir \1:
+'"$ALL_NAME$OMF"'s:\(.*/omf/[a-zA-Z0-9.\_\-]\+$\):%dir \1:
+s:^\([^%].*\)::
+s:%lang(C) ::' | egrep -v '^$' >> $MO_NAME
+
 if [ "$(egrep -v '(^%defattr|^$)' $MO_NAME | wc -l)" -le 0 ]; then
-	echo 'Error: international files not found !'
+	echo >&2 "Error: international files not found for $NAME!"
 	exit 1
 fi