From 10e20dbe2094cd81f63660d1873879606af47c7c Mon Sep 17 00:00:00 2001
From: Tobias Klauser <tklauser@distanz.ch>
Date: Mon, 20 Oct 2014 09:41:11 +0200
Subject: bashrc: Allow to start bash from zsh

---
 .bashrc | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/.bashrc b/.bashrc
index 3e4b665..1a2e8ce 100644
--- a/.bashrc
+++ b/.bashrc
@@ -1,7 +1,9 @@
 # ~/.bashrc: executed by bash(1) for non-login shells.
 
+parent=$(ps -o comm= -p $PPID)
+
 # use zsh if available and configured
-if [ -f /bin/zsh ] && [ -f .zsh/override_bash ] ; then
+if [ -f /bin/zsh ] && [ -f .zsh/override_bash ] && [ "x$parent" != "xzsh" ] && [ "x$parent" != "bash" ] ; then
 	exec /bin/zsh
 fi
 
@@ -77,5 +79,6 @@ alias l='ls -hl'
 if [ -f /etc/bash_completion ]; then
     . /etc/bash_completion
 fi
+
 export NACL_INC_DIR=/home/tobiask/nacl/nacl-20110221/build/ziws06/include/amd64
 export NACL_LIB_DIR=/home/tobiask/nacl/nacl-20110221/build/ziws06/lib/amd64
-- 
cgit v1.2.3-54-g00ecf