From: Dmitri Vereshchagin <dmitri.vereshchagin@gmail.com>
Date: Tue, 22 Sep 2015 05:52:24 +0000 (+0300)
Subject: zshrc: fix screen alias
X-Git-Tag: v0.12.4~4
X-Git-Url: http://git.grml.org/?p=grml-etc-core.git;a=commitdiff_plain;h=d0c99ea503ef53c6998b36da7dbe9f2c026a8aeb

zshrc: fix screen alias

- Using `${commands[screen]}' which is expanded in double quotes makes
  it impossible to use custom screen installation or wrapper.  Use
  `screen' instead.

- Screen reads configuration from $HOME/.screenrc by default so it is
  redundant to set alias for this.
---

diff --git a/etc/zsh/zshrc b/etc/zsh/zshrc
index ab43aef..a6f9670 100644
--- a/etc/zsh/zshrc
+++ b/etc/zsh/zshrc
@@ -2504,16 +2504,14 @@ hash -d www=/var/www
 if check_com -c screen ; then
     if [[ $UID -eq 0 ]] ; then
         if [[ -r /etc/grml/screenrc ]]; then
-            alias screen="${commands[screen]} -c /etc/grml/screenrc"
+            alias screen='screen -c /etc/grml/screenrc'
         fi
-    elif [[ -r $HOME/.screenrc ]] ; then
-        alias screen="${commands[screen]} -c $HOME/.screenrc"
-    else
+    elif [[ ! -r $HOME/.screenrc ]] ; then
         if [[ -r /etc/grml/screenrc_grml ]]; then
-            alias screen="${commands[screen]} -c /etc/grml/screenrc_grml"
+            alias screen='screen -c /etc/grml/screenrc_grml'
         else
             if [[ -r /etc/grml/screenrc ]]; then
-                alias screen="${commands[screen]} -c /etc/grml/screenrc"
+                alias screen='screen -c /etc/grml/screenrc'
             fi
         fi
     fi