From: Michael Prokop <mika@grml.org>
Date: Tue, 16 Jun 2015 09:06:44 +0000 (+0200)
Subject: zshrc: no longer explicitly set SHELL
X-Git-Tag: v0.12.1~2
X-Git-Url: http://git.grml.org/?p=grml-etc-core.git;a=commitdiff_plain;h=a5468f8195489f6c662d08c88dee8a9f6657acbf

zshrc: no longer explicitly set SHELL

This was needed as a workaround for aterm, rxvt,..
Hopefully this isn't needed anymore, instead we're
running into issues like #788819 where an unreachable
$SHELL is causing problems with other tools.
---

diff --git a/doc/grmlzshrc.t2t b/doc/grmlzshrc.t2t
index ab49647..975cc17 100644
--- a/doc/grmlzshrc.t2t
+++ b/doc/grmlzshrc.t2t
@@ -402,10 +402,6 @@ already set otherwise.
 : **PAGER**
 Set less(1) as default pager, if not already set to something different.
 
-: **SHELL**
-Set explicitly to /bin/zsh, to prevent certain terminal emulators to
-default to /bin/sh or /bin/bash.
-
 
 == OPTIONS ==
 Apart from zsh's default options, //grmlzshrc// sets some options
diff --git a/etc/zsh/zshrc b/etc/zsh/zshrc
index f3c270b..aecbabf 100644
--- a/etc/zsh/zshrc
+++ b/etc/zsh/zshrc
@@ -624,14 +624,6 @@ export PAGER=${PAGER:-less}
 #v#
 export MAIL=${MAIL:-/var/mail/$USER}
 
-# if we don't set $SHELL then aterm, rxvt,.. will use /bin/sh or /bin/bash :-/
-if [[ -z "$SHELL" ]] ; then
-  SHELL="$(which zsh)"
-  if [[ -x "$SHELL" ]] ; then
-    export SHELL
-  fi
-fi
-
 # color setup for ls:
 check_com -c dircolors && eval $(dircolors -b)
 # color setup for ls on OS X / FreeBSD:
@@ -2938,7 +2930,7 @@ fi
 
 # zsh profiling
 profile() {
-    ZSH_PROFILE_RC=1 $SHELL "$@"
+    ZSH_PROFILE_RC=1 zsh "$@"
 }
 
 #f1# Edit an alias via zle