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

diff --git a/rpm-find-lang b/rpm-find-lang
index 81df987..9c586ed 100644
--- a/rpm-find-lang
+++ b/rpm-find-lang
@@ -49,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
@@ -59,8 +60,9 @@ if [ -z "$1" ]; then
 	usage
 elif [ $1 = / ]; then
 	echo >&2 "$PROG: expects non-/ argument for '$1'"
+	exit 1
 elif [ ! -d $1 ]; then
-	echo "$PROG: $1: No such directory"
+	echo >&2 "$PROG: $1: No such directory"
 	exit 1
 else
 	TOP_DIR="${1%/}"
@@ -76,6 +78,7 @@ shift
 
 GNOME='#'
 KDE='#'
+OMF='#'
 MO=''
 MO_NAME=$NAME.lang
 ALL_NAME='#'
@@ -84,21 +87,26 @@ while test $# -gt 0 ; do
     case "$1" in
 	--with-gnome)
   		GNOME=''
-		echo >&2 "$PROG: Enabling with GNOME"
+		echo "$PROG: Enabling with GNOME"
 		shift
 		;;
 	--with-kde)
-		echo >&2 "$PROG: Enabling with KDE"
+		echo "$PROG: Enabling with KDE"
 		KDE=''
 		shift
 		;;
+	--with-omf)
+		echo "$PROG: Enabling with OMF"
+		OMF=''
+		shift
+		;;
 	--without-mo)
-		echo >&2 "$PROG: Disabling .mo files"
+		echo "$PROG: Disabling .mo files"
 		MO='#'
 		shift
 		;;
 	--all-name)
-		echo >&2 "$PROG: Enabling with all names"
+		echo "$PROG: Enabling with all names"
 		ALL_NAME=''
 		NO_ALL_NAME='#'
 		shift
@@ -112,7 +120,7 @@ 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/:.*//
@@ -121,6 +129,14 @@ 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
@@ -134,7 +150,20 @@ 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"
@@ -171,7 +200,19 @@ s:%lang(C) ::' | egrep -v '^$' >> $MO_NAME
 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