SOURCES: rpm-find-lang - fgrep (x)or cat, never both (i.e. fix dup...

[qboosh]

Author: qboosh                       Date: Sat Dec 30 17:37:10 2006 GMT
Module: SOURCES                       Tag: HEAD
---- Log message:
- fgrep (x)or cat, never both (i.e. fix duplicate entries with --all-name)

---- Files affected:
SOURCES:
   rpm-find-lang (1.13 -> 1.14) 

---- Diffs:

================================================================
Index: SOURCES/rpm-find-lang
diff -u SOURCES/rpm-find-lang:1.13 SOURCES/rpm-find-lang:1.14
--- SOURCES/rpm-find-lang:1.13	Mon Aug 28 20:45:30 2006
+++ SOURCES/rpm-find-lang	Sat Dec 30 18:37:05 2006
@@ -113,7 +113,7 @@
 		s:'"$TOP_DIR"'::' > __find.files
 fi
 
-{ [ "$ALL_NAME" ] || cat __find.files && fgrep $NAME __find.files; } | sed '
+{ [ "$ALL_NAME" ] && fgrep $NAME __find.files || cat __find.files; } | 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:^\([^%].*\)::
@@ -123,7 +123,7 @@
 if [ ! -f __find.dirs ]; then
 	find $TOP_DIR -type d | sed 's:'"$TOP_DIR"'::' > __find.dirs
 fi
-{ [ "$ALL_NAME" ] || cat __find.dirs && fgrep $NAME __find.dirs; } | sed '
+{ [ "$ALL_NAME" ] && fgrep $NAME __find.dirs || cat __find.dirs; } | 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:
@@ -134,7 +134,7 @@
 s:^\([^%].*\)::
 s:%lang(C) ::' | egrep -v '^$' >> $MO_NAME
 
-{ [ "$ALL_NAME" ] || cat __find.dirs && fgrep $NAME __find.dirs; } | sed '
+{ [ "$ALL_NAME" ] && fgrep $NAME __find.dirs || cat __find.dirs; } | 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.\_\-]\+/\)::
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/SOURCES/rpm-find-lang?r1=1.13&r2=1.14&f=u