From: Elan Ruusamäe <glen@pld-linux.org>
Date: Wed, 3 Jan 2007 01:50:21 +0000 (+0000)
Subject: - use if statement to increase readability
X-Git-Tag: auto/ac/rpm-4_4_2-38
X-Git-Url: http://git.pld-linux.org/gitweb.cgi?a=commitdiff_plain;h=bff718e8fab831ab507c3c272458de02875a4b3d;p=packages%2Frpm-build-macros.git

- use if statement to increase readability

Changed files:
    rpm-find-lang -> 1.15
---

diff --git a/rpm-find-lang b/rpm-find-lang
index 91b014f..8d996b8 100644
--- a/rpm-find-lang
+++ b/rpm-find-lang
@@ -113,7 +113,13 @@ if [ ! -f __find.files ]; then
 		s:'"$TOP_DIR"'::' > __find.files
 fi
 
-{ [ "$ALL_NAME" ] && fgrep $NAME __find.files || cat __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:^\([^%].*\)::
@@ -123,7 +129,14 @@ s:^\$::' | egrep -v '^$' >> $MO_NAME
 if [ ! -f __find.dirs ]; then
 	find $TOP_DIR -type d | sed 's:'"$TOP_DIR"'::' > __find.dirs
 fi
-{ [ "$ALL_NAME" ] && fgrep $NAME __find.dirs || cat __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:
@@ -134,7 +147,7 @@ s:%lang(.*) .*/gnome/help/[a-zA-Z0-9.\_\-]\+/[a-zA-Z0-9.\_\-]\+/.*::
 s:^\([^%].*\)::
 s:%lang(C) ::' | egrep -v '^$' >> $MO_NAME
 
-{ [ "$ALL_NAME" ] && fgrep $NAME __find.dirs || cat __find.dirs; } | sed '
+{ [ "$ALL_NAME" ] || cat __find.dirs && fgrep $NAME __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.\_\-]\+/\)::