### umask 022 is less restrictive, 077 more paranoid
umask 077
-PATH="$HOME"/bin:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin
+PATH="$HOME"/bin:"$HOME"/.local/bin:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin
MANPATH="$HOME"/man:/usr/local/man:/usr/share/man:/usr/man
# LD_LIBRARY_PATH=/usr/local/lib:/usr/lib:/lib
export PATH MANPATH # LD_LIBRARY_PATH
stty sane erase ^H
- if [ -n "`which less 2>/dev/null`" ]; then
+ if which less >/dev/null 2>&1; then
HAS_LESS=true
fi
;;
esac
- OPS1=${OPS1}"${debian_chroot:+($debian_chroot)}\u@\h \W "
+ OPS1=${OPS1}"${debian_chroot:+($debian_chroot)}\u@\h \W \\$"
. "$ENV"
else
- OPS1="${debian_chroot:+($debian_chroot)}`/usr/bin/whoami`@`/bin/hostname -s` "
+ OPS1="${debian_chroot:+($debian_chroot)}`/usr/bin/whoami`@`/bin/hostname -s` >"
fi
- #PROMPT_DIRTRIM=2
- export OPS1 # PROMPT_DIRTRIM
+ export OPS1
### biff controls new mail notification
#biff n
unset name email
- if test -f .hushlogin && ! cmp -s .motd /etc/motd; then
- tee $HOME/.motd < /etc/motd
- fi
+ #if test -f .hushlogin && ! cmp -s .motd /etc/motd; then
+ # tee $HOME/.motd < /etc/motd
+ #fi
fi
# No need to set DISPLAY - ssh sets DISPLAY and calls xauth
#
# fi
# fi
+
+# If not running interactively, don't do anything
+case $- in
+ *i*) ;;
+ *) return ;;
+esac
+
+# Stop if non-interactive shell
+[ -z "$PS1" ] && return
+
+if [ -n "$SSH_CONNECTION" -a -z "$STY" -a -t 0 ] &&
+ which screen >/dev/null 2>&1
+then
+ exec screen -xRR -S default
+fi