Don't use the carat (^) in class matches, as it is not supported by

some shells. Use precendency order instead.

Should fix PR 33236.
This commit is contained in:
joerg 2006-04-11 14:35:48 +00:00
parent 82136ee63d
commit f860aa0fbb
2 changed files with 9 additions and 4 deletions

View file

@ -1,6 +1,6 @@
#! /bin/sh
# $NetBSD: bootstrap,v 1.49 2006/04/10 18:29:24 joerg Exp $
# $NetBSD: bootstrap,v 1.50 2006/04/11 14:35:48 joerg Exp $
#
#
# Copyright (c) 2001-2002 Alistair G. Crooks. All rights reserved.
@ -317,7 +317,10 @@ DragonFly)
check_prog mtreeprog mtree
machine_arch=`uname -p`
case `uname -r` in
1.0* | 1.1 | 1.1[^0-9]* | 1.2.* | 1.3.*)
1.1[0-9]*)
[ -z "$fetch_cmd" ] && fetch_cmd="/usr/bin/ftp"
;;
1.0* | 1.1 | 1.2.* | 1.3.*)
;;
*)
[ -z "$fetch_cmd" ] && fetch_cmd="/usr/bin/ftp"

View file

@ -1,6 +1,6 @@
#!/bin/sh
# $NetBSD: mkbinarykit,v 1.14 2006/04/10 18:29:24 joerg Exp $
# $NetBSD: mkbinarykit,v 1.15 2006/04/11 14:35:48 joerg Exp $
#
# Make a binary bootstrap kit and place it in targetdir (or current
# working directory if not specified). The mk.conf.example file is
@ -41,7 +41,9 @@ AIX)
;;
DragonFly)
case "$osrev" in
1.0* | 1.1 | 1.1[^0-9]* | 1.2.* | 1.3.*)
1.1[0-9]*)
;;
1.0* | 1.1 | 1.2.* | 1.3.*)
# Don't use the ports /var/db/pkg
pkgdbdir=$prefix/pkgdb
;;