From f395da5d7a83523fa4ece83749bc963e1eca86be Mon Sep 17 00:00:00 2001 From: Florian Pritz Date: Tue, 30 Sep 2014 16:29:16 +0200 Subject: zprofile: don't start screen inside tmux Signed-off-by: Florian Pritz --- .zprofile | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) (limited to '.zprofile') diff --git a/.zprofile b/.zprofile index 153aee6..46d8309 100644 --- a/.zprofile +++ b/.zprofile @@ -9,12 +9,14 @@ if tty -s && [[ -z $DISPLAY ]]; then fi fi - if type screen &>/dev/null && [[ -e ~/.screenrc-2 ]]; then - screenname=$(screen -list | grep "screen-sh-2") - if [ ! "$screenname" ]; then - exec screen -S "screen-sh-2" -c ~/.screenrc-2 - elif echo $screenname | grep -q "Detached"; then - exec screen -r screen-sh-2 + if [[ -z "$TMUX" ]]; then + if type screen &>/dev/null && [[ -e ~/.screenrc-2 ]]; then + screenname=$(screen -list | grep "screen-sh-2") + if [ ! "$screenname" ]; then + exec screen -S "screen-sh-2" -c ~/.screenrc-2 + elif echo $screenname | grep -q "Detached"; then + exec screen -r screen-sh-2 + fi fi fi fi -- cgit v1.2.3-24-g4f1b