zshrc: fix screen alias
authorDmitri Vereshchagin <dmitri.vereshchagin@gmail.com>
Tue, 22 Sep 2015 05:52:24 +0000 (08:52 +0300)
committerMichael Prokop <mika@grml.org>
Mon, 28 Sep 2015 22:07:59 +0000 (00:07 +0200)
- 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.

etc/zsh/zshrc

index ab43aef..a6f9670 100644 (file)
@@ -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