summaryrefslogtreecommitdiffstats
path: root/.zprofile
diff options
context:
space:
mode:
Diffstat (limited to '.zprofile')
-rw-r--r--.zprofile14
1 files changed, 8 insertions, 6 deletions
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