path: root/sh/profile
diff options
authorTom Ryder <tom@sanctum.geek.nz>2016-12-03 00:22:17 +1300
committerTom Ryder <tom@sanctum.geek.nz>2016-12-03 00:22:17 +1300
commit3135b4ce8d5974e1dee530928a8aacffe7eac433 (patch)
treef836bd76271f7c313286bc3ebe69376a0cf45f80 /sh/profile
parentColor compatibility fixes for tlcs(1df) (diff)
Split ~/.shrc off stub ~/.shinit file
NetBSD sh(1) and possible others don't tolerate a `return` short-circuit for ENV, which means that because that implementation also sources ENV if set regardless of whether the shell is interactive or not, all of the interactive stuff in ~/.shrc and ~/.shrc.d gets uselessly sourced and loaded up for non-interactive invocations of sh(1). To work around this, I've set ENV to be a new ~/.shinit file instead, which sources the ~/.shrc file only if the shell is interactive. ~/.shinit is the filename suggested in the man page for NetBSD sh(1) and Debian dash(1) as well. NetBSD's documented behaviour seems to be contrary to POSIX 2003: > ENV: This variable, when and only when an interactive shell is > invoked, shall be subjected to parameter expansion (see Parameter > Expansion ) by the shell, and the resulting value shall be used as a > pathname of a file containing shell commands to execute in the > current environment. No matter; this works fine, and makes non-interactive invocations of sh(1) on NetBSD much faster.
Diffstat (limited to 'sh/profile')
1 files changed, 3 insertions, 3 deletions
diff --git a/sh/profile b/sh/profile
index afc308ea..fd87b8fa 100644
--- a/sh/profile
+++ b/sh/profile
@@ -7,8 +7,8 @@ for sh in "$HOME"/.profile.d/*.sh ; do
unset -v sh
-# If ENV is unset after running those scripts and ~/.shrc exists, set it as ENV
-if [ -z "$ENV" ] && [ -f "$HOME"/.shrc ] ; then
- ENV=$HOME/.shrc
+# If ENV is still unset, and ~/.shinit exists, use that
+if [ -z "$ENV" ] && [ -f "$HOME"/.shinit ] ; then
+ ENV=$HOME/.shinit
export ENV