Mercurialcrosstool-ng / changeset
summary | shortlog | changelog | graph | tags | branches | files | changeset | raw | bz2 | help
[libc-eglibc] Rewrite part of the code bash_array
author"Yann E. MORIN" <yann.morin.1998@anciens.enib.fr>
Mon Jul 27 22:16:07 2009 +0200 (2009-07-27)
branchbash_array
changeset 1476eded63022651
parent 1475 1626414b1662
child 1477 232ba0dc96b1
[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.
scripts/build/libc/eglibc.sh file | annotate | diff | revisions 
     1.1 --- a/scripts/build/libc/eglibc.sh	Mon Jul 27 22:14:08 2009 +0200
     1.2 +++ b/scripts/build/libc/eglibc.sh	Mon Jul 27 22:16:07 2009 +0200
     1.3 @@ -41,19 +41,21 @@
     1.4      eglibc_ports="${CT_LIBC}-ports-${CT_LIBC_VERSION}.tar.bz2"
     1.5  
     1.6      # Check if every tarballs are already present
     1.7 -    if [ -f "${CT_TARBALLS_DIR}/${eglibc}" ]              && \
     1.8 -       [ -f "${CT_TARBALLS_DIR}/${eglibc_linuxthreads}" ] && \
     1.9 -       [ -f "${CT_TARBALLS_DIR}/${eglibc_localedef}" ]    && \
    1.10 -       [ -f "${CT_TARBALLS_DIR}/${eglibc_ports}" ]; then
    1.11 +    if [    -f "${CT_TARBALLS_DIR}/${eglibc}"                   \
    1.12 +         -a -f "${CT_TARBALLS_DIR}/${eglibc_linuxthreads}"      \
    1.13 +         -a -f "${CT_TARBALLS_DIR}/${eglibc_localedef}"         \
    1.14 +         -a -f "${CT_TARBALLS_DIR}/${eglibc_ports}"             \
    1.15 +       ]; then
    1.16          CT_DoLog DEBUG "Already have 'eglibc-${CT_LIBC_VERSION}'"
    1.17          return 0
    1.18      fi
    1.19  
    1.20 -    if [ -f "${CT_LOCAL_TARBALLS_DIR}/${eglibc}" ]              && \
    1.21 -       [ -f "${CT_LOCAL_TARBALLS_DIR}/${eglibc_linuxthreads}" ] && \
    1.22 -       [ -f "${CT_LOCAL_TARBALLS_DIR}/${eglibc_localedef}" ]    && \
    1.23 -       [ -f "${CT_LOCAL_TARBALLS_DIR}/${eglibc_ports}" ]        && \
    1.24 -       [ "${CT_FORCE_DOWNLOAD}" != "y" ]; then
    1.25 +    if [    -f "${CT_LOCAL_TARBALLS_DIR}/${eglibc}"                 \
    1.26 +         -a -f "${CT_LOCAL_TARBALLS_DIR}/${eglibc_linuxthreads}"    \
    1.27 +         -a -f "${CT_LOCAL_TARBALLS_DIR}/${eglibc_localedef}"       \
    1.28 +         -a -f "${CT_LOCAL_TARBALLS_DIR}/${eglibc_ports}"           \
    1.29 +         "${CT_FORCE_DOWNLOAD}" != "y"                              \
    1.30 +       ]; then
    1.31          CT_DoLog DEBUG "Got 'eglibc-${CT_LIBC_VERSION}' from local storage"
    1.32          for file in ${eglibc} ${eglibc_linuxthreads} ${eglibc_localedef} ${eglibc_ports}; do
    1.33              CT_DoExecLog ALL ln -s "${CT_LOCAL_TARBALLS_DIR}/${file}" "${CT_TARBALLS_DIR}/${file}"
crosstool-ng