Mirrors/coreutils
2
0
Fork 0
mirror of https://github.com/uutils/coreutils synced 2024-12-13 23:02:38 +00:00
Code Issues Projects Releases Packages Wiki Activity

Merge pull request #3569 from cakebaker/overridable_args

Browse source 
dircolors: make -b & -c args overridable
This commit is contained in:
Terts Diepraam 2022-05-27 13:08:25 +02:00 committed by GitHub
commit 7861cc9dca
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 16 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/uu/dircolors/src/dircolors.rs
View file

@ -166,6 +166,7 @@ pub fn uu_app<'a>() -> Command<'a> {
.long("sh") .long("sh")
.short('b') .short('b')
.visible_alias("bourne-shell") .visible_alias("bourne-shell")
.overrides_with(options::C_SHELL)
.help("output Bourne shell code to set LS_COLORS") .help("output Bourne shell code to set LS_COLORS")
.display_order(1), .display_order(1),
) )
@ -174,6 +175,7 @@ pub fn uu_app<'a>() -> Command<'a> {
.long("csh") .long("csh")
.short('c') .short('c')
.visible_alias("c-shell") .visible_alias("c-shell")
.overrides_with(options::BOURNE_SHELL)
.help("output C shell code to set LS_COLORS") .help("output C shell code to set LS_COLORS")
.display_order(2), .display_order(2),
) )

14
tests/by-util/test_dircolors.rs
View file

@ -1,3 +1,4 @@
// spell-checker:ignore overridable
use crate::common::util::*; use crate::common::util::*;
extern crate dircolors; extern crate dircolors;
@ -78,6 +79,19 @@ fn test_csh_default() {
.run() .run()
.stdout_is_fixture("csh_def.expected"); .stdout_is_fixture("csh_def.expected");
} }
#[test]
fn test_overridable_args() {
new_ucmd!()
.env("TERM", "screen")
.arg("-bc")
.run()
.stdout_is_fixture("csh_def.expected");
new_ucmd!()
.env("TERM", "screen")
.arg("-cb")
.run()
.stdout_is_fixture("bash_def.expected");
}
#[test] #[test]
fn test_no_env() { fn test_no_env() {