[src/trunk]: src/distrib/sets Move default values for several shell variables...

[apb <apb%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/c0aea94da5f1
branches:  trunk
changeset: 586834:c0aea94da5f1
user:      apb <apb%NetBSD.org@localhost>
date:      Tue Jan 03 15:42:42 2006 +0000

description:
Move default values for several shell variables into sets.subr.

Reviewed by agc

diffstat:

 distrib/sets/checkflist  |   6 +++---
 distrib/sets/makesrctars |   8 +++-----
 distrib/sets/makesums    |   5 +++--
 distrib/sets/maketars    |  12 +++---------
 distrib/sets/sets.subr   |  13 +++++++++++--
 distrib/sets/syspkgdeps  |   9 ++++-----
 6 files changed, 27 insertions(+), 26 deletions(-)

diffs (158 lines):

diff -r cfa47b76bb7a -r c0aea94da5f1 distrib/sets/checkflist
--- a/distrib/sets/checkflist   Tue Jan 03 15:31:15 2006 +0000
+++ b/distrib/sets/checkflist   Tue Jan 03 15:42:42 2006 +0000
@@ -1,6 +1,6 @@
 #! /bin/sh --
 #
-#      $NetBSD: checkflist,v 1.26 2005/10/21 02:41:14 jmc Exp $
+#      $NetBSD: checkflist,v 1.27 2006/01/03 15:42:42 apb Exp $
 #
 # Verify output of makeflist against contents of $DESTDIR.
 
@@ -10,9 +10,9 @@
 fi
 
 prog=${0##*/}
+rundir="$(dirname "$0")" # ${0%/*} isn't good enough when there's no "/"
+. "${rundir}/sets.subr"
 
-: ${HOST_SH:=sh}
-: ${MKTEMP:=mktemp}
 SDIR=$(${MKTEMP} -d /tmp/${prog}.XXXXXX)
 
 es=0
diff -r cfa47b76bb7a -r c0aea94da5f1 distrib/sets/makesrctars
--- a/distrib/sets/makesrctars  Tue Jan 03 15:31:15 2006 +0000
+++ b/distrib/sets/makesrctars  Tue Jan 03 15:42:42 2006 +0000
@@ -1,18 +1,16 @@
 #! /bin/sh
 #
-#      $NetBSD: makesrctars,v 1.27 2005/10/21 04:11:49 jmc Exp $
+#      $NetBSD: makesrctars,v 1.28 2006/01/03 15:42:42 apb Exp $
 #
 # makesrctars srcdir setdir
 #      Create source tarballs in setdir from the source under srcdir.
 #
 
 prog=${0##*/}
+rundir="$(dirname "$0")" # ${0%/*} isn't good enough when there's no "/"
+. "${rundir}/sets.subr"
 
 # set defaults
-: ${CKSUM:=cksum}
-: ${MTREE:=/usr/sbin/mtree}
-: ${PAX:=pax}
-
 xsrcdir=
 
 GZIP=-9
diff -r cfa47b76bb7a -r c0aea94da5f1 distrib/sets/makesums
--- a/distrib/sets/makesums     Tue Jan 03 15:31:15 2006 +0000
+++ b/distrib/sets/makesums     Tue Jan 03 15:42:42 2006 +0000
@@ -1,6 +1,6 @@
 #!/bin/sh
 #
-# $NetBSD: makesums,v 1.11 2005/10/21 02:41:14 jmc Exp $
+# $NetBSD: makesums,v 1.12 2006/01/03 15:42:42 apb Exp $
 #
 # Make checksum files for files in ``tardir''.  Usage:
 # makesums [-a] [-t tardir] [setname [...]]
@@ -20,9 +20,10 @@
 #
 
 prog=${0##*/}
+rundir="$(dirname "$0")" # ${0%/*} isn't good enough when there's no "/"
+. "${rundir}/sets.subr"
 
 # set defaults
-: ${CKSUM:=cksum}
 targetdir=$RELEASEDIR
 dash_all=no
 append=\>
diff -r cfa47b76bb7a -r c0aea94da5f1 distrib/sets/maketars
--- a/distrib/sets/maketars     Tue Jan 03 15:31:15 2006 +0000
+++ b/distrib/sets/maketars     Tue Jan 03 15:42:42 2006 +0000
@@ -1,6 +1,6 @@
 #!/bin/sh
 #
-# $NetBSD: maketars,v 1.55 2005/10/21 02:41:14 jmc Exp $
+# $NetBSD: maketars,v 1.56 2006/01/03 15:42:42 apb Exp $
 #
 # Make release tar files for some or all lists.  Usage:
 # maketars [-b] [-x] [-i installdir] [-a arch] [-m machine] [-s setsdir]
@@ -15,17 +15,11 @@
 #
 
 prog=${0##*/}
+rundir="$(dirname "$0")" # ${0%/*} isn't good enough when there's no "/"
+. "${rundir}/sets.subr"
 
 # set defaults
-: ${HOST_SH:=sh}
-: ${MKTEMP:=mktemp}
-: ${MTREE:=/usr/sbin/mtree}
-: ${PAX:=pax}
-
-rundir=${0%/*}
-. ${rundir}/sets.subr
 lists=$nlists
-
 tars=$RELEASEDIR
 dest=$DESTDIR
 metalog=
diff -r cfa47b76bb7a -r c0aea94da5f1 distrib/sets/sets.subr
--- a/distrib/sets/sets.subr    Tue Jan 03 15:31:15 2006 +0000
+++ b/distrib/sets/sets.subr    Tue Jan 03 15:42:42 2006 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: sets.subr,v 1.41 2005/05/01 07:06:09 lukem Exp $
+#      $NetBSD: sets.subr,v 1.42 2006/01/03 15:42:42 apb Exp $
 #
 
 #
@@ -61,6 +61,15 @@
        USE_KERBEROS    \
        USE_YP          \
 "
+#
+# The following variables refer to tools that are used when building sets:
+#
+: ${CKSUM:=cksum}
+: ${HOST_SH:=sh}
+: ${MKTEMP:=mktemp}
+: ${MTREE:=/usr/sbin/mtree}
+: ${PAX:=pax}
+: ${TOOL_DB:=db}
 
 oIFS=$IFS
 IFS="
@@ -127,7 +136,7 @@
 # In each file, a record consists of a path and a System Package name,
 # separated by whitespace. E.g.,
 #
-#      # $NetBSD: sets.subr,v 1.41 2005/05/01 07:06:09 lukem Exp $
+#      # $NetBSD: sets.subr,v 1.42 2006/01/03 15:42:42 apb Exp $
 #      .                       base-sys-root   [keyword[,...]]
 #      ./altroot               base-sys-root
 #      ./bin                   base-sys-root
diff -r cfa47b76bb7a -r c0aea94da5f1 distrib/sets/syspkgdeps
--- a/distrib/sets/syspkgdeps   Tue Jan 03 15:31:15 2006 +0000
+++ b/distrib/sets/syspkgdeps   Tue Jan 03 15:42:42 2006 +0000
@@ -9,14 +9,13 @@
 
 #set -u
 
-: ${TOOL_DB:=db}
-DB="${TOOL_DB} -q"
-
 #
 # set defaults and import setlist subroutines
 #
-rundir=${0%/*}
-. ${rundir}/sets.subr
+rundir="$(dirname "$0")" # ${0%/*} isn't good enough when there's no "/"
+. "${rundir}/sets.subr"
+
+DB="${TOOL_DB} -q"
 prefix=/
 
 usage()