- fgrep (x)or cat, never both (i.e. fix duplicate entries with --all-name)

Changed files:
    rpm-find-lang -> 1.14

diff --git a/rpm-find-lang b/rpm-find-lang
index 16d73a77c5785b52da63156283ad75743314d832..91b014fdc09537331c0486e14987bb6fab406e02 100644 (file)
--- a/rpm-find-lang
+++ b/rpm-find-lang
@@ -113,7 +113,7 @@ if [ ! -f __find.files ]; then
                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 @@ s:^\$::' | egrep -v '^$' >> $MO_NAME
 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:%lang(.*) .*/gnome/help/[a-zA-Z0-9.\_\-]\+/[a-zA-Z0-9.\_\-]\+/.*::
 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.\_\-]\+/\)::