diff options
| author | Tobias Klauser <tklauser@distanz.ch> | 2014-10-20 09:41:11 +0200 |
|---|---|---|
| committer | Tobias Klauser <tklauser@distanz.ch> | 2014-10-20 09:41:11 +0200 |
| commit | 10e20dbe2094cd81f63660d1873879606af47c7c (patch) | |
| tree | e40b076fa3d6ab7fdb6b515d134ec6bac5df2afd | |
| parent | 952000bc062a3a5a5fb64e1921e5e78f183df611 (diff) | |
bashrc: Allow to start bash from zsh
| -rw-r--r-- | .bashrc | 5 |
1 files changed, 4 insertions, 1 deletions
@@ -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 |