From 76343e4400ae44fda9dd646350ca1f8d3eae6747 Mon Sep 17 00:00:00 2001 From: dmcmahill Date: Sat, 4 Jan 2003 22:27:46 +0000 Subject: expr -> ${EXPR} --- mk/scripts/mkdatabase | 5 +++-- mk/scripts/mkreadme | 7 ++++--- 2 files changed, 7 insertions(+), 5 deletions(-) (limited to 'mk/scripts') diff --git a/mk/scripts/mkdatabase b/mk/scripts/mkdatabase index 3e8af3b7460..eb6cc9ff6f6 100755 --- a/mk/scripts/mkdatabase +++ b/mk/scripts/mkdatabase @@ -1,5 +1,5 @@ #!/bin/sh -# $NetBSD: mkdatabase,v 1.1 2003/01/04 21:03:08 dmcmahill Exp $ +# $NetBSD: mkdatabase,v 1.2 2003/01/04 22:27:46 dmcmahill Exp $ # # Script for generating a database with complete dependency information # for a particular package @@ -44,6 +44,7 @@ TMPDIR=${TMPDIR:-/tmp} BMAKE=${BMAKE:-make} AWK=${AWK:-/usr/bin/awk} DATABASE=${DATABASE:-${TMPDIR}/pkgdb.$$} +EXPR=${EXPR:-expr} # as of 2003-01-04, metapkgs/gnome gets to pass #6 so # it is very likely that if you reach 25, something is broken @@ -164,7 +165,7 @@ while [ ! -z "$dirs" -a $pass -lt ${MAX_PASS} ]; do cd $here done dirs=`${AWK} -f ../../mk/scripts/chkdatabase.awk debug=${DEBUG} ${DATABASE}` - pass=`expr $pass + 1` + pass=`${EXPR} $pass + 1` done if [ $pass -eq ${MAX_PASS} ]; then diff --git a/mk/scripts/mkreadme b/mk/scripts/mkreadme index 0b02077f32c..bd83a38b804 100755 --- a/mk/scripts/mkreadme +++ b/mk/scripts/mkreadme @@ -1,5 +1,5 @@ #!/bin/sh -# $NetBSD: mkreadme,v 1.1 2003/01/04 21:13:37 dmcmahill Exp $ +# $NetBSD: mkreadme,v 1.2 2003/01/04 22:28:33 dmcmahill Exp $ # # Script for README.html generation # @@ -43,6 +43,7 @@ TMPDIR=${TMPDIR:-/tmp/mkreadme} PKGSRCDIR=${PKGSRCDIR:-/usr/pkgsrc} BMAKE=${BMAKE:-make} AWK=${AWK:-/usr/bin/awk} +EXPR=${EXPR:-expr} usage(){ echo "$prog - Generates README.html files for a pkgsrc tree" @@ -368,11 +369,11 @@ if [ "x$restart" = "xno" ] ; then fi fi echo -n "." - if [ `expr $npkg % 100 = 0` -eq 1 ]; then + if [ `${EXPR} $npkg % 100 = 0` -eq 1 ]; then echo " " echo "$npkg" fi - npkg=`expr $npkg + 1` + npkg=`${EXPR} $npkg + 1` cd $PKGSRCDIR done else -- cgit v1.2.3