1.1 --- a/scripts/showSamples.sh	Wed Jun 25 08:53:17 2008 +0000
     1.2 +++ b/scripts/showSamples.sh	Mon Jul 07 21:25:57 2008 +0000
     1.3 @@ -31,46 +31,46 @@
     1.4          if [ ${verbose} -ne 0 ]; then
     1.5              echo    "    OS        : ${CT_KERNEL}-${CT_KERNEL_VERSION}"
     1.6              echo    "    binutils  : binutils-${CT_BINUTILS_VERSION}"
     1.7 -            echo -n "    C compiler: ${CT_CC}-${CT_CC_VERSION} (C"
     1.8 -            [ "${CT_CC_LANG_CXX}" = "y"     ] && echo -n ",C++"
     1.9 -            [ "${CT_CC_LANG_FORTRAN}" = "y" ] && echo -n ",Fortran"
    1.10 -            [ "${CT_CC_LANG_JAVA}" = "y"    ] && echo -n ",Java"
    1.11 -            [ "${CT_CC_LANG_ADA}" = "y"     ] && echo -n ",ADA"
    1.12 -            [ "${CT_CC_LANG_OBJC}" = "y"    ] && echo -n ",Objective-C"
    1.13 -            [ "${CT_CC_LANG_OBJCXX}" = "y"  ] && echo -n ",Objective-C++"
    1.14 -            [ -n "${CT_CC_LANG_OTHERS}"     ] && echo -n ",$CT_CC_LANG_OTHERS}"
    1.15 +            printf  "    C compiler: ${CT_CC}-${CT_CC_VERSION} (C"
    1.16 +            [ "${CT_CC_LANG_CXX}" = "y"     ] && printf ",C++"
    1.17 +            [ "${CT_CC_LANG_FORTRAN}" = "y" ] && printf ",Fortran"
    1.18 +            [ "${CT_CC_LANG_JAVA}" = "y"    ] && printf ",Java"
    1.19 +            [ "${CT_CC_LANG_ADA}" = "y"     ] && printf ",ADA"
    1.20 +            [ "${CT_CC_LANG_OBJC}" = "y"    ] && printf ",Objective-C"
    1.21 +            [ "${CT_CC_LANG_OBJCXX}" = "y"  ] && printf ",Objective-C++"
    1.22 +            [ -n "${CT_CC_LANG_OTHERS}"     ] && printf ",$CT_CC_LANG_OTHERS}"
    1.23              echo    ")"
    1.24              echo    "    C library : ${CT_LIBC}-${CT_LIBC_VERSION}"
    1.25 -            echo -n "    Tools     :"
    1.26 -            [ "${CT_LIBELF}"  ] && echo -n " libelf-${CT_LIBELF_VERSION}"
    1.27 -            [ "${CT_SSTRIP}"  ] && echo -n " sstrip"
    1.28 -            [ "${CT_DMALLOC}" ] && echo -n " dmalloc-${CT_DMALLOC_VERSION}"
    1.29 -            [ "${CT_DUMA}"    ] && echo -n " duma-${CT_DUMA_VERSION}"
    1.30 -            [ "${CT_GDB}"     ] && echo -n " gdb-${CT_GDB_VERSION}"
    1.31 -            [ "${CT_LTRACE}"  ] && echo -n " ltrace-${CT_LTRACE_VERSION}"
    1.32 -            [ "${CT_STRACE}"  ] && echo -n " strace-${CT_STRACE_VERSION}"
    1.33 +            printf  "    Tools     :"
    1.34 +            [ "${CT_LIBELF}"  ] && printf " libelf-${CT_LIBELF_VERSION}"
    1.35 +            [ "${CT_SSTRIP}"  ] && printf " sstrip"
    1.36 +            [ "${CT_DMALLOC}" ] && printf " dmalloc-${CT_DMALLOC_VERSION}"
    1.37 +            [ "${CT_DUMA}"    ] && printf " duma-${CT_DUMA_VERSION}"
    1.38 +            [ "${CT_GDB}"     ] && printf " gdb-${CT_GDB_VERSION}"
    1.39 +            [ "${CT_LTRACE}"  ] && printf " ltrace-${CT_LTRACE_VERSION}"
    1.40 +            [ "${CT_STRACE}"  ] && printf " strace-${CT_STRACE_VERSION}"
    1.41              echo
    1.42          fi
    1.43      else
    1.44 -        echo -n "| ''${sample}''  "
    1.45 -        echo -n "|  ${CT_KERNEL_VERSION}  "
    1.46 -        echo -n "|  ${CT_BINUTILS_VERSION}  "
    1.47 -        echo -n "|  ${CT_CC_VERSION}  "
    1.48 -        echo -n "|  ''${CT_LIBC}''  "
    1.49 -        echo -n "|  ${CT_LIBC_VERSION}  "
    1.50 -        echo -n "|  ${CT_THREADS_NPTL:+NPTL}${CT_THREADS_LINUXTHREADS:+linuxthreads}${CT_THREADS_NONE:+none}  "
    1.51 -        echo -n "|  ${CT_ARCH_FLOAT_HW:+hard}${CT_ARCH_FLOAT_SW:+soft} float  "
    1.52 -        echo -n "|  "
    1.53 +        printf "| ''${sample}''  "
    1.54 +        printf "|  ${CT_KERNEL_VERSION}  "
    1.55 +        printf "|  ${CT_BINUTILS_VERSION}  "
    1.56 +        printf "|  ${CT_CC_VERSION}  "
    1.57 +        printf "|  ''${CT_LIBC}''  "
    1.58 +        printf "|  ${CT_LIBC_VERSION}  "
    1.59 +        printf "|  ${CT_THREADS_NPTL:+NPTL}${CT_THREADS_LINUXTHREADS:+linuxthreads}${CT_THREADS_NONE:+none}  "
    1.60 +        printf "|  ${CT_ARCH_FLOAT_HW:+hard}${CT_ARCH_FLOAT_SW:+soft} float  "
    1.61 +        printf "|  "
    1.62          if [ -f "${sample_top}/samples/${sample}/reported.by" ]; then
    1.63              ( . "${sample_top}/samples/${sample}/reported.by"
    1.64                if [ -n "${reporter_url}" ]; then
    1.65 -                  echo -n "|  [[${reporter_url}|${reporter_name}]]  "
    1.66 +                  printf "|  [[${reporter_url}|${reporter_name}]]  "
    1.67                else
    1.68 -                  echo -n "|  ${reporter_name}  "
    1.69 +                  printf "|  ${reporter_name}  "
    1.70                fi
    1.71              )
    1.72          else
    1.73 -            echo -n "|  [[http://ymorin.is-a-geek.org/|YEM]]  "
    1.74 +            printf "|  [[http://ymorin.is-a-geek.org/|YEM]]  "
    1.75          fi
    1.76          echo "|"
    1.77      fi
    1.78 @@ -84,17 +84,17 @@
    1.79  
    1.80  if [ "${opt}" = -w ]; then
    1.81      echo "^ $(date +%Y%m%d.%H%M) ^ |||||||||"
    1.82 -    echo -n "^ Target "
    1.83 -    echo -n "^  kernel headers\\\\ version  "
    1.84 -    echo -n "^  binutils version  "
    1.85 -    echo -n "^  gcc version  "
    1.86 -    echo -n "^  libc  "
    1.87 -    echo -n "^  libc version  "
    1.88 -    echo -n "^  threading model  "
    1.89 -    echo -n "^  float support  "
    1.90 -    echo -n "^  Misc  "
    1.91 -    echo -n "^  Reported by  "
    1.92 -    echo    "^"
    1.93 +    printf "^ Target "
    1.94 +    printf "^  kernel headers\\\\ version  "
    1.95 +    printf "^  binutils version  "
    1.96 +    printf "^  gcc version  "
    1.97 +    printf "^  libc  "
    1.98 +    printf "^  libc version  "
    1.99 +    printf "^  threading model  "
   1.100 +    printf "^  float support  "
   1.101 +    printf "^  Misc  "
   1.102 +    printf "^  Reported by  "
   1.103 +    echo   "^"
   1.104  fi
   1.105  for sample in "${@}"; do
   1.106      ( dump_single_sample ${opt} ${width} "${sample}" )