From e4855367b401011f559f32349e24d6b9d99e763b Mon Sep 17 00:00:00 2001
From: "Yann E. MORIN\"" <yann.morin.1998@anciens.enib.fr>
Date: Mon, 27 Jul 2009 22:16:07 +0200
Subject: [libc-eglibc] Rewrite part of the code

Rewrite part of the code to better match the rest.
Most notably, rewrite handling of:
  if [ ... ] && [ ... ]
to:
  if [ ... -a ... ]

This has the positive side effect of calling "[" only once, although
"[" is probably a shell built-in.

diff --git a/scripts/build/libc/eglibc.sh b/scripts/build/libc/eglibc.sh
index dcce76c..18364c5 100644
--- a/scripts/build/libc/eglibc.sh
+++ b/scripts/build/libc/eglibc.sh
@@ -41,19 +41,21 @@ do_libc_get() {
     eglibc_ports="${CT_LIBC}-ports-${CT_LIBC_VERSION}.tar.bz2"
 
     # Check if every tarballs are already present
-    if [ -f "${CT_TARBALLS_DIR}/${eglibc}" ]              && \
-       [ -f "${CT_TARBALLS_DIR}/${eglibc_linuxthreads}" ] && \
-       [ -f "${CT_TARBALLS_DIR}/${eglibc_localedef}" ]    && \
-       [ -f "${CT_TARBALLS_DIR}/${eglibc_ports}" ]; then
+    if [    -f "${CT_TARBALLS_DIR}/${eglibc}"                   \
+         -a -f "${CT_TARBALLS_DIR}/${eglibc_linuxthreads}"      \
+         -a -f "${CT_TARBALLS_DIR}/${eglibc_localedef}"         \
+         -a -f "${CT_TARBALLS_DIR}/${eglibc_ports}"             \
+       ]; then
         CT_DoLog DEBUG "Already have 'eglibc-${CT_LIBC_VERSION}'"
         return 0
     fi
 
-    if [ -f "${CT_LOCAL_TARBALLS_DIR}/${eglibc}" ]              && \
-       [ -f "${CT_LOCAL_TARBALLS_DIR}/${eglibc_linuxthreads}" ] && \
-       [ -f "${CT_LOCAL_TARBALLS_DIR}/${eglibc_localedef}" ]    && \
-       [ -f "${CT_LOCAL_TARBALLS_DIR}/${eglibc_ports}" ]        && \
-       [ "${CT_FORCE_DOWNLOAD}" != "y" ]; then
+    if [    -f "${CT_LOCAL_TARBALLS_DIR}/${eglibc}"                 \
+         -a -f "${CT_LOCAL_TARBALLS_DIR}/${eglibc_linuxthreads}"    \
+         -a -f "${CT_LOCAL_TARBALLS_DIR}/${eglibc_localedef}"       \
+         -a -f "${CT_LOCAL_TARBALLS_DIR}/${eglibc_ports}"           \
+         "${CT_FORCE_DOWNLOAD}" != "y"                              \
+       ]; then
         CT_DoLog DEBUG "Got 'eglibc-${CT_LIBC_VERSION}' from local storage"
         for file in ${eglibc} ${eglibc_linuxthreads} ${eglibc_localedef} ${eglibc_ports}; do
             CT_DoExecLog ALL ln -s "${CT_LOCAL_TARBALLS_DIR}/${file}" "${CT_TARBALLS_DIR}/${file}"
-- 
cgit v0.10.2-6-g49f6