[src/trunk]: src/distrib/sets use osrelease.sh -k instead of hand-rolled logic.

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

details:   https://anonhg.NetBSD.org/src/rev/12ee1be3ad3a
branches:  trunk
changeset: 777382:12ee1be3ad3a
user:      christos <christos%NetBSD.org@localhost>
date:      Fri Feb 17 00:00:39 2012 +0000

description:
use osrelease.sh -k instead of hand-rolled logic.

diffstat:

 distrib/sets/sets.subr |  12 ++++--------
 1 files changed, 4 insertions(+), 8 deletions(-)

diffs (40 lines):

diff -r c8490292e288 -r 12ee1be3ad3a distrib/sets/sets.subr
--- a/distrib/sets/sets.subr    Fri Feb 17 00:00:02 2012 +0000
+++ b/distrib/sets/sets.subr    Fri Feb 17 00:00:39 2012 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: sets.subr,v 1.135 2012/02/07 19:13:24 joerg Exp $
+#      $NetBSD: sets.subr,v 1.136 2012/02/17 00:00:39 christos Exp $
 #
 
 #
@@ -159,11 +159,7 @@
 xlists="xbase xcomp xetc xfont xserver"
 extlists="extbase extcomp extetc"
 
-OSRELEASE=`${HOST_SH} ${NETBSDSRCDIR}/sys/conf/osrelease.sh -n`
-# for release branches, use X.Y version, for -current use X.Y.Z
-if [ ! "${OSRELEASE%.99}" = "${OSRELEASE}" ]; then
-       OSRELEASE=`${HOST_SH} ${NETBSDSRCDIR}/sys/conf/osrelease.sh`
-fi
+OSRELEASE=$(${HOST_SH} ${NETBSDSRCDIR}/sys/conf/osrelease.sh -k)
 MODULEDIR="stand/${MACHINE}/${OSRELEASE}/modules"
 SUBST="s#@MODULEDIR@#${MODULEDIR}#g"
 SUBST="${SUBST};s#@OSRELEASE@#${OSRELEASE}#g"
@@ -176,7 +172,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.135 2012/02/07 19:13:24 joerg Exp $
+#      # $NetBSD: sets.subr,v 1.136 2012/02/17 00:00:39 christos Exp $
 #      .                       base-sys-root   [keyword[,...]]
 #      ./altroot               base-sys-root
 #      ./bin                   base-sys-root
@@ -500,7 +496,7 @@
 print_set_lists()
 {
        for setname; do
-               list=`list_set_lists $setname`
+               list=$(list_set_lists $setname)
                for l in $list; do
                        echo $l
                        if $verbose; then