From 8a59ee0311e27e603a735c25123478e76c61a71b Mon Sep 17 00:00:00 2001
From: tg <tg@mirbsd.org>
Date: Thu, 4 Jan 2007 23:40:50 +0000
Subject: [PATCH] * mention additions go at the bottom (e.g. 'source' scripts),
 in case   they fail (due to nonexistence), so that the rest is still executed
 * export $MKSH (users can set SHELL=$MKSH here, but I'm conservative)

---
 dot.mkshrc | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/dot.mkshrc b/dot.mkshrc
index b57870e..41080e1 100644
--- a/dot.mkshrc
+++ b/dot.mkshrc
@@ -1,4 +1,6 @@
-# $MirOS: src/bin/mksh/dot.mkshrc,v 1.3 2006/08/28 01:34:47 tg Exp $
+# $MirOS: src/bin/mksh/dot.mkshrc,v 1.4 2007/01/04 23:40:50 tg Exp $
+#-
+# Add user-defined additions at the end, to prevent abortion on failure.
 
 : ${EDITOR:=/bin/ed} ${HOSTNAME:=$(hostname -s 2>/dev/null || hostname)}
 PS1='$(((rv=$?)) && print $rv\|)${USER:=$(id -un)}@${HOSTNAME:=nil}:$(
@@ -15,8 +17,8 @@ PS1='$(((rv=$?)) && print $rv\|)${USER:=$(id -un)}@${HOSTNAME:=nil}:$(
 		fi
 	done
 	print -r -- "$pfx$wd")'" $(if (( $(id -u) )); then
-		print \$; else print \#; fi) "
-export EDITOR HOSTNAME PS1 USER
+		print \$; else print \#; fi) " MKSH=$(whence -p mksh)
+export EDITOR HOSTNAME MKSH PS1 USER
 
 alias l='/bin/ls -F'
 alias la='l -a'