From 37b5e6be8132f976fbe5dfa6e33e6204a4d4dc4f Mon Sep 17 00:00:00 2001 From: Carlos O'Donell Date: Thu, 8 Aug 2013 11:23:18 -0400 Subject: [PATCH] Avoid complex shell constructs. Don't use subshells when not needed. Don't use `|| :' to hide errors. --- glibc.spec | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/glibc.spec b/glibc.spec index 33300d7..c24f62d 100644 --- a/glibc.spec +++ b/glibc.spec @@ -863,7 +863,7 @@ gzip -9nvf $RPM_BUILD_ROOT%{_infodir}/libc* %ifnarch %{auxarches} olddir=`pwd` pushd ${RPM_BUILD_ROOT}%{_prefix}/lib/locale -rm locale-archive || : +rm -f locale-archive # Intentionally we do not pass --alias-file=, aliases will be added # by build-locale-archive. $olddir/build-%{target}/elf/ld.so \ @@ -1244,8 +1244,12 @@ popd # The #line directives gperf generates do not give the proper # file name relative to the build directory. -(cd locale; ln -s programs/*.gperf .) -(cd iconv; ln -s ../locale/programs/charmap-kw.gperf .) +pushd locale +ln -s programs/*.gperf . +popd +pushd iconv +ln -s ../locale/programs/charmap-kw.gperf . +popd # Print some diagnostic information in the builds about the # getconf binaries.