Call perl directly instead of using an sh script to find it.

OK otto@

3 files changed, 2 insertions, 62 deletions

diff --git a/bin/ksh/Makefile b/bin/ksh/Makefile
index c6d815ad2cc..6cf7301376f 100644
--- a/bin/ksh/Makefile
+++ b/bin/ksh/Makefile
@@ -1,4 +1,4 @@
-#	$OpenBSD: Makefile,v 1.22 2004/12/30 21:34:24 otto Exp $
+#	$OpenBSD: Makefile,v 1.23 2004/12/31 16:24:09 millert Exp $
 
 PROG=	ksh
 SRCS=	alloc.c c_ksh.c c_sh.c c_test.c c_ulimit.c edit.c emacs.c \
@@ -22,6 +22,6 @@ emacs.out: emacs.c
 	/bin/sh ${.CURDIR}/emacs-gen.sh ${.CURDIR}/emacs.c > emacs.out
 
 check test:
-	/bin/sh ${.CURDIR}/tests/th.sh ${.CURDIR}/tests/th -s ${.CURDIR}/tests -p ./ksh -C pdksh,sh,ksh,posix,posix-upu
+	/usr/bin/perl ${.CURDIR}/tests/th -s ${.CURDIR}/tests -p ./ksh -C pdksh,sh,ksh,posix,posix-upu
 
 .include <bsd.prog.mk>
diff --git a/bin/ksh/tests/th-sh b/bin/ksh/tests/th-sh
deleted file mode 100644
index fef8750c03d..00000000000
--- a/bin/ksh/tests/th-sh
+++ /dev/null
@@ -1,30 +0,0 @@
-#!/bin/sh
-#	$OpenBSD: th-sh,v 1.2 2001/01/28 23:04:57 niklas Exp $
-
-
-#
-# Simple script to find perl and run it
-#
-
-# Avoid common problems with ENV (though perl shouldn't let it through)
-# (can you believe some shells don't have an unset???)
-unset ENV
-
-x=x
-[ -x /bin/sh ] 2> /dev/null || x=f
-
-IFS=:$IFS
-perl=
-for i in $PATH; do
-    [ X"$i" = X ] && i=.
-    for j in perl perl4 perl5 ; do
-	[ -$x "$i/$j" ] && perl=$i/$j && break 2
-    done
-done
-
-[ X"$perl" = X ] && {
-	echo "$0: can't find perl - bye\n" 1>&2
-	exit 1
-    }
-
-exec $perl "$@"
diff --git a/bin/ksh/tests/th.sh b/bin/ksh/tests/th.sh
deleted file mode 100644
index 93b07582efb..00000000000
--- a/bin/ksh/tests/th.sh
+++ /dev/null
@@ -1,30 +0,0 @@
-#!/bin/sh
-#	$OpenBSD: th.sh,v 1.4 2001/01/28 23:04:57 niklas Exp $
-
-
-#
-# Simple script to find perl and run it
-#
-
-# Avoid common problems with ENV (though perl shouldn't let it through)
-# (can you believe some shells don't have an unset???)
-unset ENV
-
-x=x
-[ -x /bin/sh ] 2> /dev/null || x=f
-
-IFS=:$IFS
-perl=
-for i in $PATH; do
-    [ X"$i" = X ] && i=.
-    for j in perl perl4 perl5 ; do
-	[ -$x "$i/$j" ] && perl=$i/$j && break 2
-    done
-done
-
-[ X"$perl" = X ] && {
-	echo "$0: can't find perl - bye\n" 1>&2
-	exit 1
-    }
-
-exec $perl "$@"