summaryrefslogtreecommitdiff
path: root/scripts
diff options
context:
space:
mode:
authorYann E. MORIN" <yann.morin.1998@anciens.enib.fr>2008-07-07 21:25:57 (GMT)
committerYann E. MORIN" <yann.morin.1998@anciens.enib.fr>2008-07-07 21:25:57 (GMT)
commit22bd5ce4cad2496772a005556fbc33bbbcad4bf9 (patch)
tree1af16bbf8169d1bb48564e52e89b8d250c2e7ca2 /scripts
parent48728211f654cf3f8113097fa00a14f89f197779 (diff)
Although working with bash, 'echo -n' is really non-portable.
Get rid of this by using printf(1) with no trailing new-line (\n). Again, thanks to Martin GUY, who pointed this issue. /trunk/kconfig/kconfig.mk | 2 1 1 0 /trunk/scripts/build/libc_uClibc.sh | 4 3 1 0 ++ /trunk/scripts/showSamples.sh | 78 39 39 0 +++++++++++++++++++++--------------------- 3 files changed, 43 insertions(+), 41 deletions(-)
Diffstat (limited to 'scripts')
-rw-r--r--scripts/build/libc_uClibc.sh4
-rwxr-xr-xscripts/showSamples.sh78
2 files changed, 42 insertions, 40 deletions
diff --git a/scripts/build/libc_uClibc.sh b/scripts/build/libc_uClibc.sh
index ce768a1..a650559 100644
--- a/scripts/build/libc_uClibc.sh
+++ b/scripts/build/libc_uClibc.sh
@@ -154,7 +154,9 @@ mungeuClibcConfig() {
dst_config_file="$2"
munge_file="${CT_BUILD_DIR}/munge-uClibc-config.sed"
- echo -n >"${munge_file}"
+ # Start with a fresh file
+ rm -f "${munge_file}"
+ touch "${munge_file}"
# Hack our target in the config file.
# Also remove stripping: its the responsibility of the
diff --git a/scripts/showSamples.sh b/scripts/showSamples.sh
index dc149b7..339bb3b 100755
--- a/scripts/showSamples.sh
+++ b/scripts/showSamples.sh
@@ -31,46 +31,46 @@ dump_single_sample() {
if [ ${verbose} -ne 0 ]; then
echo " OS : ${CT_KERNEL}-${CT_KERNEL_VERSION}"
echo " binutils : binutils-${CT_BINUTILS_VERSION}"
- echo -n " C compiler: ${CT_CC}-${CT_CC_VERSION} (C"
- [ "${CT_CC_LANG_CXX}" = "y" ] && echo -n ",C++"
- [ "${CT_CC_LANG_FORTRAN}" = "y" ] && echo -n ",Fortran"
- [ "${CT_CC_LANG_JAVA}" = "y" ] && echo -n ",Java"
- [ "${CT_CC_LANG_ADA}" = "y" ] && echo -n ",ADA"
- [ "${CT_CC_LANG_OBJC}" = "y" ] && echo -n ",Objective-C"
- [ "${CT_CC_LANG_OBJCXX}" = "y" ] && echo -n ",Objective-C++"
- [ -n "${CT_CC_LANG_OTHERS}" ] && echo -n ",$CT_CC_LANG_OTHERS}"
+ printf " C compiler: ${CT_CC}-${CT_CC_VERSION} (C"
+ [ "${CT_CC_LANG_CXX}" = "y" ] && printf ",C++"
+ [ "${CT_CC_LANG_FORTRAN}" = "y" ] && printf ",Fortran"
+ [ "${CT_CC_LANG_JAVA}" = "y" ] && printf ",Java"
+ [ "${CT_CC_LANG_ADA}" = "y" ] && printf ",ADA"
+ [ "${CT_CC_LANG_OBJC}" = "y" ] && printf ",Objective-C"
+ [ "${CT_CC_LANG_OBJCXX}" = "y" ] && printf ",Objective-C++"
+ [ -n "${CT_CC_LANG_OTHERS}" ] && printf ",$CT_CC_LANG_OTHERS}"
echo ")"
echo " C library : ${CT_LIBC}-${CT_LIBC_VERSION}"
- echo -n " Tools :"
- [ "${CT_LIBELF}" ] && echo -n " libelf-${CT_LIBELF_VERSION}"
- [ "${CT_SSTRIP}" ] && echo -n " sstrip"
- [ "${CT_DMALLOC}" ] && echo -n " dmalloc-${CT_DMALLOC_VERSION}"
- [ "${CT_DUMA}" ] && echo -n " duma-${CT_DUMA_VERSION}"
- [ "${CT_GDB}" ] && echo -n " gdb-${CT_GDB_VERSION}"
- [ "${CT_LTRACE}" ] && echo -n " ltrace-${CT_LTRACE_VERSION}"
- [ "${CT_STRACE}" ] && echo -n " strace-${CT_STRACE_VERSION}"
+ printf " Tools :"
+ [ "${CT_LIBELF}" ] && printf " libelf-${CT_LIBELF_VERSION}"
+ [ "${CT_SSTRIP}" ] && printf " sstrip"
+ [ "${CT_DMALLOC}" ] && printf " dmalloc-${CT_DMALLOC_VERSION}"
+ [ "${CT_DUMA}" ] && printf " duma-${CT_DUMA_VERSION}"
+ [ "${CT_GDB}" ] && printf " gdb-${CT_GDB_VERSION}"
+ [ "${CT_LTRACE}" ] && printf " ltrace-${CT_LTRACE_VERSION}"
+ [ "${CT_STRACE}" ] && printf " strace-${CT_STRACE_VERSION}"
echo
fi
else
- echo -n "| ''${sample}'' "
- echo -n "| ${CT_KERNEL_VERSION} "
- echo -n "| ${CT_BINUTILS_VERSION} "
- echo -n "| ${CT_CC_VERSION} "
- echo -n "| ''${CT_LIBC}'' "
- echo -n "| ${CT_LIBC_VERSION} "
- echo -n "| ${CT_THREADS_NPTL:+NPTL}${CT_THREADS_LINUXTHREADS:+linuxthreads}${CT_THREADS_NONE:+none} "
- echo -n "| ${CT_ARCH_FLOAT_HW:+hard}${CT_ARCH_FLOAT_SW:+soft} float "
- echo -n "| "
+ printf "| ''${sample}'' "
+ printf "| ${CT_KERNEL_VERSION} "
+ printf "| ${CT_BINUTILS_VERSION} "
+ printf "| ${CT_CC_VERSION} "
+ printf "| ''${CT_LIBC}'' "
+ printf "| ${CT_LIBC_VERSION} "
+ printf "| ${CT_THREADS_NPTL:+NPTL}${CT_THREADS_LINUXTHREADS:+linuxthreads}${CT_THREADS_NONE:+none} "
+ printf "| ${CT_ARCH_FLOAT_HW:+hard}${CT_ARCH_FLOAT_SW:+soft} float "
+ printf "| "
if [ -f "${sample_top}/samples/${sample}/reported.by" ]; then
( . "${sample_top}/samples/${sample}/reported.by"
if [ -n "${reporter_url}" ]; then
- echo -n "| [[${reporter_url}|${reporter_name}]] "
+ printf "| [[${reporter_url}|${reporter_name}]] "
else
- echo -n "| ${reporter_name} "
+ printf "| ${reporter_name} "
fi
)
else
- echo -n "| [[http://ymorin.is-a-geek.org/|YEM]] "
+ printf "| [[http://ymorin.is-a-geek.org/|YEM]] "
fi
echo "|"
fi
@@ -84,17 +84,17 @@ done
if [ "${opt}" = -w ]; then
echo "^ $(date +%Y%m%d.%H%M) ^ |||||||||"
- echo -n "^ Target "
- echo -n "^ kernel headers\\\\ version "
- echo -n "^ binutils version "
- echo -n "^ gcc version "
- echo -n "^ libc "
- echo -n "^ libc version "
- echo -n "^ threading model "
- echo -n "^ float support "
- echo -n "^ Misc "
- echo -n "^ Reported by "
- echo "^"
+ printf "^ Target "
+ printf "^ kernel headers\\\\ version "
+ printf "^ binutils version "
+ printf "^ gcc version "
+ printf "^ libc "
+ printf "^ libc version "
+ printf "^ threading model "
+ printf "^ float support "
+ printf "^ Misc "
+ printf "^ Reported by "
+ echo "^"
fi
for sample in "${@}"; do
( dump_single_sample ${opt} ${width} "${sample}" )