From 35433c0f2087eacaa0b40841121fe8594e4e22be Mon Sep 17 00:00:00 2001
From: Tom Ryder <tom@sanctum.geek.nz>
Date: Sun, 18 Dec 2016 23:56:22 +1300
Subject: Defer kshrc loading until after shrc all loaded

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

diff --git a/ksh/shrc.d/ksh.sh b/ksh/shrc.d/ksh.sh
index 0045a470..106c898f 100644
--- a/ksh/shrc.d/ksh.sh
+++ b/ksh/shrc.d/ksh.sh
@@ -30,8 +30,5 @@ fi
 # If KSH_ENV isn't already set, set it
 [ -n "$KSH_ENV" ] || KSH_ENV=$HOME/.kshrc
 
-# Check the file named in KSH_ENV exists
-[ -f "$KSH_ENV" ] || return
-
-# Source it (finally)
-. "$KSH_ENV"
+# If ENV_EXT isn't already set, set it
+[ -n "$ENV_EXT" ] || ENV_EXT=$KSH_ENV
diff --git a/sh/shrc b/sh/shrc
index 8bbc5147..8a6c0062 100644
--- a/sh/shrc
+++ b/sh/shrc
@@ -19,3 +19,6 @@ for sh in "$HOME"/.shrc.d/*.sh ; do
     [ -e "$sh" ] && . "$sh"
 done
 unset -v sh
+
+# If ENV_EXT was set and exists, source that too
+[ -f "$ENV_EXT" ] && . "$ENV_EXT"
-- 
cgit v1.2.3