diff options
-rwxr-xr-x | autogen.sh | 8 | ||||
-rwxr-xr-x | testit.sh | 10 |
2 files changed, 9 insertions, 9 deletions
@@ -1,7 +1,7 @@ #!/bin/sh # -# $Id: autogen.sh,v 1.29 2013/07/03 16:50:20 devzero2000 Exp $ +# $Id: autogen.sh,v 1.30 2014/03/28 17:10:13 devzero2000 Exp $ # autogen.sh: autogen.sh script for popt projects # # Copyright (c) 2010-2011 Elia Pinto <devzero2000@rpm5.org> @@ -106,7 +106,7 @@ check_versions() { while read app req_ver; do # Honor $APP variables ($TAR, $AUTOCONF, etc.) - appvar=`echo $app | tr '[a-z]' '[A-Z]'` + appvar=$(echo $app | tr '[a-z]' '[A-Z]') test "$appvar" = TAR && appvar=AMTAR eval "app=\${$appvar-$app}" inst_ver=$(get_version $app) @@ -159,10 +159,10 @@ else fi # Libtool -libtoolize=`which glibtoolize 2>/dev/null` +libtoolize=$(which glibtoolize 2>/dev/null) case $libtoolize in /*) export LIBTOOL=glibtool;; - *) libtoolize=`which libtoolize 2>/dev/null` + *) libtoolize=$(which libtoolize 2>/dev/null) case $libtoolize in /*) ;; *) libtoolize=libtoolize @@ -30,14 +30,14 @@ if [ -z "${valgrind_environment}" ] then MALLOC_CHECK_=3 export MALLOC_CHECK_ - [ -n "${RANDOM}" ] && MALLOC_PERTURB_=`expr \( $RANDOM % 255 \) + 1 ` + [ -n "${RANDOM}" ] && MALLOC_PERTURB_=$(expr \( $RANDOM % 255 \) + 1 ) export MALLOC_PERTURB_ # if [ -z "${MALLOC_PERTURB_}" ] # RANDOM is a bashism then - r=`ps -ef | cksum | cut -f1 -d" " 2>/dev/null` + r=$(ps -ef | cksum | cut -f1 -d" " 2>/dev/null) [ -z "${r}" ] && r=1234567890 - MALLOC_PERTURB_=`expr \( $r % 255 \) + 1 ` + MALLOC_PERTURB_=$(expr \( $r % 255 \) + 1 ) export MALLOC_PERTURB_ fi fi @@ -49,7 +49,7 @@ run() { echo Running test $name. - result=`HOME=$builddir $builddir/$prog $* 2>&1` + result=$(HOME=$builddir $builddir/$prog $* 2>&1) if [ "$answer" != "$result" ]; then echo "Test \"$prog $*\" failed with: \"$result\" != \"$answer\" " @@ -81,7 +81,7 @@ run_diff() { rm $out $diff_file } -builddir=`pwd` +builddir=$(pwd) #srcdir=$builddir cd ${srcdir} test1=${builddir}/test1 |