05/10: Don't force colour in aliases.

[Tobias Geerinckx-Rice]

nckx pushed a commit to branch master
in repository guix.

commit 142869f80f5d339f813ec32ebf1fdd9fcc58f578
Author: Tobias Geerinckx-Rice <address@hidden>
Date:   Wed Jul 4 19:13:49 2018 +0200

    Don't force colour in aliases.
    
    * gnu/system/shadow.scm (default-skeletons): Substitute ‘--color=auto’
    for ‘--color’ (which implies ‘=always’) in aliases.
    * doc/guix.texi (G-Expressions): Also adjust examples as that makes
    more sense.
---
 doc/guix.texi         | 2 +-
 gnu/system/shadow.scm | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/doc/guix.texi b/doc/guix.texi
index 841bc2a..aeac5aa 100644
--- a/doc/guix.texi
+++ b/doc/guix.texi
@@ -5464,7 +5464,7 @@ denoting the target file.  Here's an example:
             `(("hosts" ,(plain-file "hosts"
                                     "127.0.0.1 localhost"))
               ("bashrc" ,(plain-file "bashrc"
-                                     "alias ls='ls --color'"))))
+                                     "alias ls='ls --color=auto'"))))
 @end example
 
 This yields an @code{etc} directory containing these two files.
diff --git a/gnu/system/shadow.scm b/gnu/system/shadow.scm
index 28d399f..b4db69f 100644
--- a/gnu/system/shadow.scm
+++ b/gnu/system/shadow.scm
@@ -178,9 +178,9 @@ then
 else
     PS1='address@hidden \\w\\$ '
 fi
-alias ls='ls -p --color'
+alias ls='ls -p --color=auto'
 alias ll='ls -l'
-alias grep='grep --color'\n"))
+alias grep='grep --color=auto'\n"))
         (zlogin    (plain-file "zlogin" "\
 # Honor system-wide environment variables
 source /etc/profile\n"))