diff options
author | Yann E. MORIN" <yann.morin.1998@anciens.enib.fr> | 2008-05-20 21:32:39 (GMT) |
---|---|---|
committer | Yann E. MORIN" <yann.morin.1998@anciens.enib.fr> | 2008-05-20 21:32:39 (GMT) |
commit | 0c4633c37fcfab7c1632330c070884c3295db1d2 (patch) | |
tree | 5fdc1c68e709845d81b7f29df9c63f86d4f0397b /tools/populate.in | |
parent | 62c87c5adf144f0600cdaeedfc159376cf819c79 (diff) |
Get rid of all `command` (which is a bashism), and replace them with $(command), which is POSIX.
Get rid of all remaining \"text\" in log messages and replace them with 'text'.
Optimise the progress bar, should go un-noticed at log level DEBUG and below.
/trunk/scripts/build/tools/200-sstrip.sh | 16 8 8 0 ++--
/trunk/scripts/build/libc_glibc.sh | 50 25 25 0 +++++++-------
/trunk/scripts/build/libc_uClibc.sh | 4 2 2 0
/trunk/scripts/build/debug/100-dmalloc.sh | 2 1 1 0
/trunk/scripts/build/debug/400-ltrace.sh | 2 1 1 0
/trunk/scripts/build/debug/300-gdb.sh | 8 4 4 0 +-
/trunk/scripts/build/debug/200-duma.sh | 6 3 3 0 +-
/trunk/scripts/build/kernel_linux.sh | 30 15 15 0 ++++----
/trunk/scripts/build/cc_gcc.sh | 14 7 7 0 ++--
/trunk/scripts/crosstool.sh | 54 27 27 0 ++++++++--------
/trunk/scripts/functions | 128 64 64 0 ++++++++++++++++++------------------
/trunk/scripts/saveSample.sh | 4 2 2 0
/trunk/scripts/tarball.sh.broken | 20 10 10 0 +++---
/trunk/tools/addToolVersion.sh | 8 4 4 0 +-
/trunk/tools/populate.in | 18 9 9 0 ++--
15 files changed, 182 insertions(+), 182 deletions(-)
Diffstat (limited to 'tools/populate.in')
-rw-r--r-- | tools/populate.in | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/tools/populate.in b/tools/populate.in index 690dc5f..c21248b 100644 --- a/tools/populate.in +++ b/tools/populate.in @@ -39,10 +39,10 @@ while getopts ":s:d:fvh" CT_OPT; do h) doHelp exit 0 ;; - :) echo "$myname: \"-${OPTARG}\" takes exactly one argument." + :) echo "$myname: '-${OPTARG}' takes exactly one argument." exit 1 ;; - ?) echo "$myname: unknown option \"-${OPTARG}\"." + ?) echo "$myname: unknown option '-${OPTARG}'." exit 1 ;; esac @@ -54,11 +54,11 @@ if [ -z "${CT_ROOT_SRC_DIR}" -o -z "${CT_ROOT_DST_DIR}" ]; then exit 1 fi if [ ! -d "${CT_ROOT_SRC_DIR}" ]; then - echo "$myname: \"${CT_ROOT_SRC_DIR}\": no such file or directory" + echo "$myname: '${CT_ROOT_SRC_DIR}': no such file or directory" exit 1 fi if [ -d "${CT_ROOT_DST_DIR}" -a "${CT_FORCE}" != "y" ]; then - echo "$myname: \"${CT_ROOT_DST_DIR}\": already exists" + echo "$myname: '${CT_ROOT_DST_DIR}': already exists" exit 1 fi src_inode=$(ls -di "${CT_ROOT_SRC_DIR}") @@ -91,9 +91,9 @@ while [ ${still_needed} -eq 1 ]; do ${CT_ECHO} "Looping..." still_needed=0 for f in $(find . -type f -exec file {} \; |egrep ': ELF [[:digit:]]+-bit .SB (executable|shared object),' |cut -d ":" -f 1); do - ${CT_ECHO} "Scanning \"${f}\"" + ${CT_ECHO} "Scanning '${f}'" for libname in $("${CT_READELF}" -d "${f}" |egrep '(NEEDED)' |sed -r -e 's,.+\[(.+)\] *$,\1,;'); do - ${CT_ECHO} " searching for \"${libname}\"" + ${CT_ECHO} " searching for '${libname}'" if [ -e "lib/${libname}" \ -o -e "usr/lib/${libname}" ]; then ${CT_ECHO} " already present" @@ -101,14 +101,14 @@ while [ ${still_needed} -eq 1 ]; do fi # Need to scan .. for libgcc_s et al. for dir in . usr ..; do - ${CT_ECHO} -n " trying in \"${dir}\"" + ${CT_ECHO} -n " trying in '${dir}'" tgt_dir="${dir}" [ "${tgt_dir}" = ".." ] && tgt_dir="usr" libfile="${CT_SYSROOT_DIR}/${dir}/lib/${libname}" - ${CT_ECHO} ": \"${libfile}\"" + ${CT_ECHO} ": '${libfile}'" if [ -e "${libfile}" ]; then mkdir -p "${dir}/lib" - ${CT_ECHO} " installing \"${tgt_dir}/lib/${libname}\"" + ${CT_ECHO} " installing '${tgt_dir}/lib/${libname}'" cp "${libfile}" "${tgt_dir}/lib/${libname}" still_needed=1 break |