1.1 --- a/scripts/showSamples.sh	Sun Sep 06 17:58:05 2009 +0200
     1.2 +++ b/scripts/showSamples.sh	Mon Sep 07 18:40:30 2009 +0200
     1.3 @@ -29,6 +29,7 @@
     1.4      fi
     1.5      . "${sample_top}/samples/${sample}/crosstool.config"
     1.6      if [ -z "${wiki}" ]; then
     1.7 +        t_width=10
     1.8          printf "    %-*s  [%s" ${width} "${sample}" "${sample_type}"
     1.9          [ -f "${sample_top}/samples/${sample}/broken" ] && printf "B" || printf " "
    1.10          [ "${CT_EXPERIMENTAL}" = "y" ] && printf "X" || printf " "
    1.11 @@ -37,15 +38,15 @@
    1.12              case "${CT_TOOLCHAIN_TYPE}" in
    1.13                  cross)  ;;
    1.14                  canadian)
    1.15 -                    printf "    Host      : ${CT_HOST}\n"
    1.16 +                    printf "    %-*s : %s\n" ${t_width} "Host" "${CT_HOST}"
    1.17                      ;;
    1.18              esac
    1.19 -            echo    "    OS        : ${CT_KERNEL}${CT_KERNEL_VERSION:+-}${CT_KERNEL_VERSION}"
    1.20 +            printf "    %-*s : %s\n" ${t_width} "OS" "${CT_KERNEL}${CT_KERNEL_VERSION:+-}${CT_KERNEL_VERSION}"
    1.21              if [ "${CT_GMP_MPFR}" = "y" ]; then
    1.22 -                echo    "    GMP/MPFR  : gmp-${CT_GMP_VERSION} / mpfr-${CT_MPFR_VERSION}"
    1.23 +                printf    "    %-*s : %s\n" ${t_width} "GMP/MPFR" "gmp-${CT_GMP_VERSION} / mpfr-${CT_MPFR_VERSION}"
    1.24              fi
    1.25 -            echo    "    binutils  : binutils-${CT_BINUTILS_VERSION}"
    1.26 -            printf  "    C compiler: ${CT_CC}-${CT_CC_VERSION} (C"
    1.27 +            printf  "    %-*s : %s\n" ${t_width} "binutils" "binutils-${CT_BINUTILS_VERSION}"
    1.28 +            printf  "    %-*s : %s" ${t_width} "C compiler" "${CT_CC}-${CT_CC_VERSION} (C"
    1.29              [ "${CT_CC_LANG_CXX}" = "y"     ] && printf ",C++"
    1.30              [ "${CT_CC_LANG_FORTRAN}" = "y" ] && printf ",Fortran"
    1.31              [ "${CT_CC_LANG_JAVA}" = "y"    ] && printf ",Java"
    1.32 @@ -53,9 +54,9 @@
    1.33              [ "${CT_CC_LANG_OBJC}" = "y"    ] && printf ",Objective-C"
    1.34              [ "${CT_CC_LANG_OBJCXX}" = "y"  ] && printf ",Objective-C++"
    1.35              [ -n "${CT_CC_LANG_OTHERS}"     ] && printf ",${CT_CC_LANG_OTHERS}"
    1.36 -            echo    ")"
    1.37 -            echo    "    C library : ${CT_LIBC}${CT_LIBC_VERSION:+-}${CT_LIBC_VERSION}"
    1.38 -            printf  "    Tools     :"
    1.39 +            printf ")\n"
    1.40 +            printf  "    %-*s : %s\n" ${t_width} "C library" "${CT_LIBC}${CT_LIBC_VERSION:+-}${CT_LIBC_VERSION}"
    1.41 +            printf  "    %-*s :" ${t_width} "Tools"
    1.42              [ "${CT_LIBELF}"  ] && printf " libelf-${CT_LIBELF_VERSION}"
    1.43              [ "${CT_SSTRIP}"  ] && printf " sstrip"
    1.44              [ "${CT_DMALLOC}" ] && printf " dmalloc-${CT_DMALLOC_VERSION}"
    1.45 @@ -63,7 +64,7 @@
    1.46              [ "${CT_GDB}"     ] && printf " gdb-${CT_GDB_VERSION}"
    1.47              [ "${CT_LTRACE}"  ] && printf " ltrace-${CT_LTRACE_VERSION}"
    1.48              [ "${CT_STRACE}"  ] && printf " strace-${CT_STRACE_VERSION}"
    1.49 -            echo
    1.50 +            printf "\n"
    1.51          fi
    1.52      else
    1.53          printf "| ''${sample}''  "