path: root/tmux
diff options
authorTom Ryder <tom@sanctum.geek.nz>2016-12-19 11:12:48 +1300
committerTom Ryder <tom@sanctum.geek.nz>2016-12-19 11:12:48 +1300
commit5821894757e4cf6615f86600d17169c3ef760748 (patch)
treeb9c0889fdb8ce017bba04e0813f07f9b05e5f03a /tmux
parentSet default-shell to /bin/sh in tmux.conf (diff)
Backtrack again on SHLVL mess
Going to have to figure out some other approach. I guess there's a fork-and-exec going on here or something.
Diffstat (limited to 'tmux')
1 files changed, 2 insertions, 4 deletions
diff --git a/tmux/tmux.conf.m4 b/tmux/tmux.conf.m4
index 3e2e855f..7b3fff51 100644
--- a/tmux/tmux.conf.m4
+++ b/tmux/tmux.conf.m4
@@ -9,6 +9,8 @@ set-environment -gru SSH_TTY
set-environment -gru WINDOWID
# Reset SHLVL
+# This doesn't work quite right yet; if your SHELL is something that increments
+# SHLVL, it gets incremented twice; need to figure out a clean solution to this
set-environment -gru SHLVL
# Otherwise, use the environment we had when we started; don't touch it during
@@ -18,10 +20,6 @@ set-option -g update-environment ''
# Setting this makes each new pane a non-login shell, which suits me better
set-option -g default-command "$SHELL"
-# Set the default shell to /bin/sh to parse commands to be just a little bit
-# quicker, and to avoid incrementing SHLVL twice
-set-option -g default-shell "/bin/sh"
# Expect a 256-color terminal
set-option -g default-terminal 'screen-256color'