From 795d135b7fc4db7c6ce743d9847af38ae60fab5e Mon Sep 17 00:00:00 2001 From: "Yann E. MORIN\"" Date: Mon, 27 Jul 2009 22:14:08 +0200 Subject: [libc-eglibc] Fix testing for existing files To test for existing files, use "[ -f blabla ]", not "[ -a blabla ]" Checking for a file exsitence with "-a" is a bashism. Althoug we _are_ using bash, it's disturbing as it can be misread as the 'and' operator. Fix by using "-f". diff --git a/scripts/build/libc/eglibc.sh b/scripts/build/libc/eglibc.sh index 18fac76..dcce76c 100644 --- a/scripts/build/libc/eglibc.sh +++ b/scripts/build/libc/eglibc.sh @@ -41,18 +41,18 @@ do_libc_get() { eglibc_ports="${CT_LIBC}-ports-${CT_LIBC_VERSION}.tar.bz2" # Check if every tarballs are already present - if [ -a "${CT_TARBALLS_DIR}/${eglibc}" ] && \ - [ -a "${CT_TARBALLS_DIR}/${eglibc_linuxthreads}" ] && \ - [ -a "${CT_TARBALLS_DIR}/${eglibc_localedef}" ] && \ - [ -a "${CT_TARBALLS_DIR}/${eglibc_ports}" ]; then + 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 CT_DoLog DEBUG "Already have 'eglibc-${CT_LIBC_VERSION}'" return 0 fi - if [ -a "${CT_LOCAL_TARBALLS_DIR}/${eglibc}" ] && \ - [ -a "${CT_LOCAL_TARBALLS_DIR}/${eglibc_linuxthreads}" ] && \ - [ -a "${CT_LOCAL_TARBALLS_DIR}/${eglibc_localedef}" ] && \ - [ -a "${CT_LOCAL_TARBALLS_DIR}/${eglibc_ports}" ] && \ + 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 CT_DoLog DEBUG "Got 'eglibc-${CT_LIBC_VERSION}' from local storage" for file in ${eglibc} ${eglibc_linuxthreads} ${eglibc_localedef} ${eglibc_ports}; do -- cgit v0.10.2-6-g49f6