#
# This is just a simple patch against libexec.etsh/pev in etsh-5.4.0 .
# It's not a bug, simply an improvement I didn't merge from an earlier
# pev version; that's all.
#
# -- 
# Jeffrey Allen Neitzel
#
--- ../etsh-5.4.0-libexec.etsh-pev.orig	Tue Mar 26 09:10:29 2019
+++ libexec.etsh/pev	Tue Apr  9 20:04:10 2019
@@ -2,22 +2,24 @@
 :
 : etsh - " Force sh(1), csh(1), and other shells to exit w/ error! " <'' ;;;
 :
-: "  @(#)$Id: pev,v 1.4 2019/03/26 09:10:29 jneitzel Exp $  "
+: "  @(#)$Id: pev,v 1.5 2019/04/09 20:04:10 jneitzel Exp $  "
 :
 : "  The author of this file, J.A. Neitzel <jan (at) etsh (dot) nl>,  "
 : "  hereby grants it to the public domain.                           "
 :
 
 :
-: "  print etsh version (+ ls(1) & file(1) its components)                "
+: "  print etsh version (+ ls(1) & file(1) its components)  "
 :
-: "  As you may gather from the diagnostic on lines 35 - 41 below,        "
-: "  your shell's PATH ($p) is important.  Fortunately, if you use etsh   "
-: "  as your login shell and install it into / using the default PREFIX,  "
-: "  you should be all set; the example rc files configure PREFIX ($X)    "
-: "  and PATH ($p) for you.  Otherwise, you can adjust them below         "
-: "  if needed.                                                           "
+: "  NOTE:  "
 :
+: "   As you may gather from the diagnostic on lines 39 - 45 below,        "
+: "   your shell's PATH ($p) is important.  Fortunately, if you use etsh   "
+: "   as your login shell and install it into / using the default PREFIX,  "
+: "   you should be all set; the example rc files configure PREFIX ($X)    "
+: "   and PATH ($p) for you.  Otherwise, you can adjust them below         "
+: "   if needed.                                                           "
+:
 : "  usage: pev  "
 :
 
@@ -27,7 +29,9 @@
 set Y '@ETSH_VERSION@'
 if $Y != $v if { exit } fd2 -e echo "$N: $Y != $v: error" ; if A == B
 set Z '@LIBEXECDIRETSH@'
-if { which $Z/pev >/dev/null } goto path-ok-jump
+if ! { fd2 which which >/dev/null } if { exit } fd2 -e echo "$N: which: Not found" ; if A == B
+if   { fd2 which .     >/dev/null } if { exit } fd2 -e echo "$N: which: Invalid results" ; if A == B
+if   { which $Z/pev    >/dev/null } goto path-ok-jump
 :
 : " Print a nicely formatted diagnostic, and exit with a non-zero status. "
 :