re PR ada/49511 (acats test setup fails on HP-UX using posix shell)
PR ada/49511 * ada/acats/run_acats (which): Use last field of type -p output. From-SVN: r175690
This commit is contained in:
parent
2f0c1df6f3
commit
f7069d58f6
@ -1,3 +1,8 @@
|
||||
2011-06-30 Rainer Orth <ro@CeBiTec.Uni-Bielefeld.DE>
|
||||
|
||||
PR ada/49511
|
||||
* ada/acats/run_acats (which): Use last field of type -p output.
|
||||
|
||||
2011-06-30 Dominique d'Humieres <dominiq@lps.ens.fr>
|
||||
Iain Sandoe <iains@gcc.gnu.org>
|
||||
|
||||
|
@ -10,11 +10,11 @@ fi
|
||||
# type -p is missing from Solaris 2 /bin/sh and /bin/ksh (ksh88), but both
|
||||
# ksh93 and bash have it.
|
||||
# type output format differs between ksh88 and ksh93, so avoid it if
|
||||
# type -p is present.
|
||||
# type -p is present. Unfortunately, HP-UX /bin/sh ignores -p with type.
|
||||
# Fall back to whence which ksh88 and ksh93 provide, but bash does not.
|
||||
|
||||
which () {
|
||||
path=`type -p $* 2>/dev/null` && { echo $path; return 0; }
|
||||
path=`type -p $* 2>/dev/null | awk '{print $NF}'` && { echo $path; return 0; }
|
||||
path=`type $* 2>/dev/null | awk '{print $NF}'` && { echo $path; return 0; }
|
||||
path=`whence $* 2>/dev/null` && { echo $path; return 0; }
|
||||
return 1
|
||||
|
Loading…
Reference in New Issue
Block a user