commit 280c5f44ea996583ed8bd97d4aa61aaaa83ea6e3 parent 6d14994c9ee02af29e84156b7bd16daeb102152a Author: Daniel Moch <daniel@danielmoch.com> Date: Thu, 18 Jan 2018 07:08:12 -0500 Fix SHLVL in X-spawned terms Diffstat:
| M | .shrc | | | 5 | ++--- |
| M | .xsession | | | 3 | +++ |
2 files changed, 5 insertions(+), 3 deletions(-)
diff --git a/.shrc b/.shrc @@ -74,8 +74,7 @@ then alias vim=vi fi -if type fortune > /dev/null 2>&1 && [ -z "$SSH_TTY" -a "$SHLVL" -le 1 -o \( -n "$DISPLAY" -a -z "$SSH_TTY" -a "$SHLVL" -le 2 \) ] +if [ -r /etc/motd ] && [ -z "$SSH_TTY" -a "$SHLVL" -le 1 ] then - [ -n $NEWLINE ] && echo; unset NEWLINE - fortune + cat /etc/motd fi diff --git a/.xsession b/.xsession @@ -7,6 +7,9 @@ xset dpms 0 0 300 +# Terminals spawned within X should start at SHLVL=1 +SHLVL=0; export SHLVL + if [ -d /usr/share/fonts/noto/ ] then xset fp+ /usr/share/fonts/noto/