Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions src/common/validation.rs
Original file line number Diff line number Diff line change
Expand Up @@ -49,8 +49,8 @@ fn get_canonical_util_name(util_name: &str) -> &str {
match util_name {
// uu_test aliases - '[' is an alias for test
"[" => "test",

"dir" => "ls", // dir is an alias for ls
"dir" => "ls", // dir is an alias for ls
"vdir" => "ls", // vdir is an alias for ls

// Default case - return the util name as is
_ => util_name,
Expand Down
5 changes: 5 additions & 0 deletions src/uu/ls/locales/en-US.ftl
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,13 @@ ls-about = List directory contents.
Ignore files and directories starting with a '.' by default
dir-about = List directory contents.
Ignore files and directories starting with a '.' by default
vdir-about = List directory contents.
Ignore files and directories starting with a '.' by default

Mandatory arguments to long options are mandatory for short options too.
ls-usage = ls [OPTION]... [FILE]...
dir-usage = dir [OPTION]... [FILE]...
vdir-usage = vdir [OPTION]... [FILE]...
ls-after-help = The TIME_STYLE argument can be full-iso, long-iso, iso, locale or +FORMAT. FORMAT is interpreted like in date. Also the TIME_STYLE environment variable sets the default style to use.

# Error messages
Expand Down
5 changes: 5 additions & 0 deletions src/uu/ls/locales/fr-FR.ftl
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,13 @@ ls-about = Lister le contenu des répertoires.
Ignorer les fichiers et répertoires commençant par un '.' par défaut
dir-about = Lister le contenu des répertoires.
Ignorer les fichiers et répertoires commençant par un '.' par défaut
vdir-about = Lister le contenu des répertoires.
Ignorer les fichiers et répertoires commençant par un '.' par défaut

Les arguments obligatoires pour les options longues le sont aussi pour les options courtes.
ls-usage = ls [OPTION]... [FICHIER]...
dir-usage = dir [OPTION]... [FICHIER]...
vdir-usage = vdir [OPTION]... [FICHIER]...
ls-after-help = L'argument TIME_STYLE peut être full-iso, long-iso, iso, locale ou +FORMAT. FORMAT est interprété comme dans date. De plus, la variable d'environnement TIME_STYLE définit le style par défaut à utiliser.

# Messages d'erreur
Expand Down
5 changes: 0 additions & 5 deletions src/uu/vdir/locales/en-US.ftl

This file was deleted.

3 changes: 3 additions & 0 deletions src/uu/vdir/src/vdir.rs
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@ use std::path::Path;
use uu_ls::{Config, Format, options};
use uucore::error::UResult;
use uucore::quoting_style::QuotingStyle;
use uucore::{format_usage, translate};

#[uucore::main]
pub fn uumain(args: impl uucore::Args) -> UResult<()> {
Expand Down Expand Up @@ -61,4 +62,6 @@ pub fn uumain(args: impl uucore::Args) -> UResult<()> {
// an uu_app function, so we need this dummy one.
pub fn uu_app() -> Command {
uu_ls::uu_app()
.override_usage(format_usage(&translate!("vdir-usage")))
.about(translate!("vdir-about"))
}
4 changes: 2 additions & 2 deletions src/uucore/src/lib/lib.rs
Original file line number Diff line number Diff line change
Expand Up @@ -171,8 +171,8 @@ pub fn get_canonical_util_name(util_name: &str) -> &str {
match util_name {
// uu_test aliases - '[' is an alias for test
"[" => "test",

"dir" => "ls", // dir is an alias for ls
"dir" => "ls", // dir is an alias for ls
"vdir" => "ls", // vdir is an alias for ls

// Default case - return the util name as is
_ => util_name,
Expand Down
18 changes: 18 additions & 0 deletions tests/by-util/test_vdir.rs
Original file line number Diff line number Diff line change
Expand Up @@ -56,3 +56,21 @@ fn test_column_output() {
fn test_invalid_option_exit_code() {
new_ucmd!().arg("-/").fails().code_is(2);
}

#[test]
fn test_help_shows_vdir_not_ls() {
let result = new_ucmd!().arg("--help").succeeds();
let output = result.stdout_str();

// Verify help text contains "vdir" in the usage line
assert!(
output.contains("vdir [OPTION]"),
"Help should show 'vdir [OPTION]'"
);

// Verify help text does not incorrectly show "ls"
assert!(
!output.contains("ls [OPTION]"),
"Help should not show 'ls [OPTION]'"
);
}
Loading