diff options
| author | Tobias Geerinckx-Rice <me@tobias.gr> | 2018-07-04 19:13:49 +0200 |
|---|---|---|
| committer | Tobias Geerinckx-Rice <me@tobias.gr> | 2018-07-05 02:35:03 +0200 |
| commit | 142869f80f5d339f813ec32ebf1fdd9fcc58f578 (patch) | |
| tree | 4af17de3e4edbfe4a8694f1b1718d1928b1f7855 | |
| parent | 1e6191bb55afd1173a3ce3a8a7116b5332aedf52 (diff) | |
| download | patches-142869f80f5d339f813ec32ebf1fdd9fcc58f578.tar patches-142869f80f5d339f813ec32ebf1fdd9fcc58f578.tar.gz | |
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.
| -rw-r--r-- | doc/guix.texi | 2 | ||||
| -rw-r--r-- | gnu/system/shadow.scm | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/doc/guix.texi b/doc/guix.texi index 841bc2a34f..aeac5aaa81 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 28d399f2b1..b4db69f068 100644 --- a/gnu/system/shadow.scm +++ b/gnu/system/shadow.scm @@ -178,9 +178,9 @@ then else PS1='\\u@\\h \\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")) |