SOURCES: rpm-find-lang - use if statement to increase readability

glen glen at pld-linux.org
Wed Jan 3 02:50:26 CET 2007


Author: glen                         Date: Wed Jan  3 01:50:26 2007 GMT
Module: SOURCES                       Tag: HEAD
---- Log message:
- use if statement to increase readability

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

---- Diffs:

================================================================
Index: SOURCES/rpm-find-lang
diff -u SOURCES/rpm-find-lang:1.14 SOURCES/rpm-find-lang:1.15
--- SOURCES/rpm-find-lang:1.14	Sat Dec 30 18:37:05 2006
+++ SOURCES/rpm-find-lang	Wed Jan  3 02:50:21 2007
@@ -113,7 +113,13 @@
 		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 @@
 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:^\([^%].*\)::
 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.\_\-]\+/\)::
================================================================

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



More information about the pld-cvs-commit mailing list