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

diff --git a/rpm-find-lang b/rpm-find-lang
index 81df987..b82c863 100644
--- a/rpm-find-lang
+++ b/rpm-find-lang
@@ -1,18 +1,20 @@
 #!/bin/sh
-#findlang - automagically generate list of language specific files
-#for inclusion in an rpm spec file.
-#This does assume that the *.mo files are under .../share/locale/...
-#Run with no arguments gets a usage message.
+# $Id$
 
-#findlang is copyright (c) 1998 by W. L. Estes <wlestes@uncg.edu>
+# findlang - automagically generate list of language specific files
+# for inclusion in an rpm spec file.
+# This does assume that the *.mo files are under .../share/locale/...
+# Run with no arguments gets a usage message.
 
-#Redistribution and use of this software are hereby permitted for any
-#purpose as long as this notice and the above copyright notice remain
-#in tact and are included with any redistribution of this file or any
-#work based on this file.
+# findlang is copyright (c) 1998 by W. L. Estes <wlestes@uncg.edu>
 
-#changes:
-# $Id$
+# Redistribution and use of this software are hereby permitted for any
+# purpose as long as this notice and the above copyright notice remain
+# in tact and are included with any redistribution of this file or any
+# work based on this file.
+
+# Changes:
+#
 # 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>
@@ -33,10 +35,10 @@
 #   * start support for KDE help files
 
 PROG=${0##*/}
+VERSION=$(set -- $Revision$; echo $2)
 
 usage () {
 cat <<EOF
-
 Usage: $PROG TOP_DIR PACKAGE_NAME [prefix]
 
 where TOP_DIR is
@@ -49,8 +51,11 @@ 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
+  -o NAME			output will be saved to NAME
+  -a NAME			output will be appended to NAME
 EOF
 exit 1
 }
@@ -59,8 +64,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,51 +82,81 @@ shift
 
 GNOME='#'
 KDE='#'
+OMF='#'
 MO=''
-MO_NAME=$NAME.lang
+OUTPUT=$NAME.lang
 ALL_NAME='#'
 NO_ALL_NAME=''
+APPEND=''
 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
 		;;
-	* )
-		MO_NAME=$1
+	-o)
+		shift
+		OUTPUT=$1
+		shift
+		;;
+	-a)
+		shift
+		OUTPUT=$1
+		APPEND='>'
+		shift
+		;;
+	*)
+		OUTPUT=$1
 		shift
 		;;
     esac
-done    
+done
+
+echo "$PROG/$VERSION: find-lang '$NAME' $APPEND> $OUTPUT"
 
+MO_NAME=.$OUTPUT.tmp~
 echo '%defattr(644,root,root,755)' > $MO_NAME
 
-if [ ! -f __find.files ]; then
-	find $TOP_DIR -type f -name '*.mo' | xargs -r file | egrep -v ', 1 messages$' | \
+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
@@ -128,14 +164,25 @@ fi
 		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
-	find $TOP_DIR -type d | sed 's:'"$TOP_DIR"'::' > __find.dirs
+'"$ALL_NAME$MO"'s:\(.*/share/locale/\)\([^/@]\+\)\(@quot\|@boldquot\)\?\(@[^/]*\)\?\(/.*\.mo$\):%lang(\2\4) \1\2\3\4\5:
+'"$NO_ALL_NAME$MO"'s:\(.*/share/locale/\)\([^/@]\+\)\(@quot\|@boldquot\)\?\(@[^/]*\)\?\(/.*/'"$NAME"'\.mo$\):%lang(\2\4) \1\2\3\4\5:
+/^[^%]/d
+s:%lang(C) ::' >> $MO_NAME
+
+(
+	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 [ ! -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
@@ -148,14 +195,23 @@ fi
 	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:
-'"$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:^\([^%].*\)::
-s:%lang(C) ::' | egrep -v '^$' >> $MO_NAME
+'"$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
@@ -164,14 +220,19 @@ s:%lang(C) ::' | egrep -v '^$' >> $MO_NAME
 		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.\_\-]\+/\)::
-'"$ALL_NAME$KDE"'s:\(.*/doc/kde/HTML/\)\([^/_]\+\)\(.*/[a-zA-Z0-9.\_\-]\+$\):%lang(\2) \1\2\3:
-s:^\([^%].*\)::
-s:%lang(C) ::' | egrep -v '^$' >> $MO_NAME
+'"$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 'Error: international files not found !'
+	echo >&2 "$PROG: Error: international files not found for '$NAME'!"
 	exit 1
 fi
+
+if [ "$APPEND" ]; then
+	cat $MO_NAME >> $OUTPUT
+	rm -f $MO_NAME
+else
+	mv -f $MO_NAME $OUTPUT
+fi