diff options
author | tron <tron@pkgsrc.org> | 2015-06-13 13:15:39 +0000 |
---|---|---|
committer | tron <tron@pkgsrc.org> | 2015-06-13 13:15:39 +0000 |
commit | 0d69d16bcff3fcc1223584a18eaf288cbea9cdad (patch) | |
tree | 7fd502c0d01a0e54f8aa6ef6ea9e097db6ed55cf /bootstrap | |
parent | 68fd777a1ed59a2dfc83040a34dabe3fe874b9ae (diff) | |
download | pkgsrc-0d69d16bcff3fcc1223584a18eaf288cbea9cdad.tar.gz |
If "/usr/bin/bash" is installed under Solaris always prefer it over the
"pdksh" package. Using the package is too problematic, see PR pkg/39524.
Diffstat (limited to 'bootstrap')
-rwxr-xr-x | bootstrap/bootstrap | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/bootstrap/bootstrap b/bootstrap/bootstrap index 712feb74c48..2eec7405714 100755 --- a/bootstrap/bootstrap +++ b/bootstrap/bootstrap @@ -1,6 +1,6 @@ #! /bin/sh -# $NetBSD: bootstrap,v 1.217 2015/06/04 15:48:45 sevan Exp $ +# $NetBSD: bootstrap,v 1.218 2015/06/13 13:15:39 tron Exp $ # # Copyright (c) 2001-2011 Alistair Crooks <agc@NetBSD.org> # All rights reserved. @@ -804,7 +804,7 @@ SunOS) else need_sed=yes fi - if [ "`uname -r`" = "5.11" -a -x "/usr/bin/bash" ]; then + if [ -x "/usr/bin/bash" ]; then bootstrap_sh=${SH:-/usr/bin/bash} bootstrap_sh_set=set else |