From fc04c0e9ad545fafd7d379cc5db7569e6b90af60 Mon Sep 17 00:00:00 2001
From: Tom Ryder <tom@sanctum.geek.nz>
Date: Fri, 17 Feb 2017 09:45:35 +1300
Subject: Condense ENV_EXT hack, unset it

---
 ksh/shrc.d/ksh.sh | 5 +----
 sh/shrc           | 3 ++-
 2 files changed, 3 insertions(+), 5 deletions(-)

diff --git a/ksh/shrc.d/ksh.sh b/ksh/shrc.d/ksh.sh
index 8e33da7c..6101fc84 100644
--- a/ksh/shrc.d/ksh.sh
+++ b/ksh/shrc.d/ksh.sh
@@ -28,8 +28,5 @@ if [ -z "$KSH_VERSION" ] ; then
     KSH_VERSION=${.sh.version}
 fi
 
-# If KSH_ENV isn't already set, set it
-[ -n "$KSH_ENV" ] || KSH_ENV=$HOME/.kshrc
-
 # If ENV_EXT isn't already set, set it
-[ -n "$ENV_EXT" ] || ENV_EXT=$KSH_ENV
+[ -n "$ENV_EXT" ] || ENV_EXT=$HOME/.kshrc
diff --git a/sh/shrc b/sh/shrc
index 879c8947..33c55e8f 100644
--- a/sh/shrc
+++ b/sh/shrc
@@ -20,5 +20,6 @@ for sh in "$HOME"/.shrc.d/*.sh ; do
 done
 unset -v sh
 
-# If ENV_EXT was set and exists, source that too
+# If ENV_EXT was set and exists, source that too, then clean it away
 [ -e "$ENV_EXT" ] && . "$ENV_EXT"
+unset -v ENV_EXT
-- 
cgit v1.2.3