Skip to content

Commit

Permalink
adjust the name
Browse files Browse the repository at this point in the history
  • Loading branch information
sylvestre committed Feb 17, 2024
1 parent f1aa60c commit f51f905
Show file tree
Hide file tree
Showing 7 changed files with 16 additions and 16 deletions.
2 changes: 1 addition & 1 deletion build.rs
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
// This file is part of the uutils coreutils package.
// This file is part of the uutils procps package.
//
// For the full copyright and license information, please view the LICENSE
// file that was distributed with this source code.
Expand Down
18 changes: 9 additions & 9 deletions src/bin/procps.rs
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
// This file is part of the uutils coreutils package.
// This file is part of the uutils procps package.
//
// For the full copyright and license information, please view the LICENSE
// file that was distributed with this source code.
Expand Down Expand Up @@ -142,7 +142,7 @@ fn gen_completions<T: uucore::Args>(
args: impl Iterator<Item = OsString>,
util_map: &UtilityMap<T>,
) -> ! {
let all_utilities: Vec<_> = std::iter::once("coreutils")
let all_utilities: Vec<_> = std::iter::once("procps")
.chain(util_map.keys().copied())
.collect();

Expand All @@ -163,8 +163,8 @@ fn gen_completions<T: uucore::Args>(
let utility = matches.get_one::<String>("utility").unwrap();
let shell = *matches.get_one::<Shell>("shell").unwrap();

let mut command = if utility == "coreutils" {
gen_coreutils_app(util_map)
let mut command = if utility == "procps" {
gen_procps_app(util_map)
} else {
util_map.get(utility).unwrap().1()
};
Expand All @@ -180,7 +180,7 @@ fn gen_manpage<T: uucore::Args>(
args: impl Iterator<Item = OsString>,
util_map: &UtilityMap<T>,
) -> ! {
let all_utilities: Vec<_> = std::iter::once("coreutils")
let all_utilities: Vec<_> = std::iter::once("procps")
.chain(util_map.keys().copied())
.collect();

Expand All @@ -195,8 +195,8 @@ fn gen_manpage<T: uucore::Args>(

let utility = matches.get_one::<String>("utility").unwrap();

let command = if utility == "coreutils" {
gen_coreutils_app(util_map)
let command = if utility == "procps" {
gen_procps_app(util_map)
} else {
util_map.get(utility).unwrap().1()
};
Expand All @@ -208,8 +208,8 @@ fn gen_manpage<T: uucore::Args>(
process::exit(0);
}

fn gen_coreutils_app<T: uucore::Args>(util_map: &UtilityMap<T>) -> Command {
let mut command = Command::new("coreutils");
fn gen_procps_app<T: uucore::Args>(util_map: &UtilityMap<T>) -> Command {
let mut command = Command::new("procps");
for (name, (_, sub_app)) in util_map {
// Recreate a small subcommand with only the relevant info
// (name & short description)
Expand Down
2 changes: 1 addition & 1 deletion src/bin/uudoc.rs
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
// This file is part of the uutils coreutils package.
// This file is part of the uutils procps package.
//
// For the full copyright and license information, please view the LICENSE
// file that was distributed with this source code.
Expand Down
4 changes: 2 additions & 2 deletions tests/common/macros.rs
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
// This file is part of the uutils coreutils package.
// This file is part of the uutils procps package.
//
// For the full copyright and license information, please view the LICENSE
// file that was distributed with this source code.
Expand Down Expand Up @@ -77,7 +77,7 @@ macro_rules! at_and_ucmd {
}

/// If `common::util::expected_result` returns an error, i.e. the `util` in `$PATH` doesn't
/// include a coreutils version string or the version is too low,
/// include a procps version string or the version is too low,
/// this macro can be used to automatically skip the test and print the reason.
#[macro_export]
macro_rules! unwrap_or_return {
Expand Down
2 changes: 1 addition & 1 deletion tests/common/mod.rs
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
// This file is part of the uutils coreutils package.
// This file is part of the uutils procps package.
//
// For the full copyright and license information, please view the LICENSE
// file that was distributed with this source code.
Expand Down
2 changes: 1 addition & 1 deletion tests/common/random.rs
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
// This file is part of the uutils coreutils package.
// This file is part of the uutils procps package.
//
// For the full copyright and license information, please view the LICENSE
// file that was distributed with this source code.
Expand Down
2 changes: 1 addition & 1 deletion tests/tests.rs
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
// This file is part of the uutils coreutils package.
// This file is part of the uutils procps package.
//
// For the full copyright and license information, please view the LICENSE
// file that was distributed with this source code.
Expand Down

0 comments on commit f51f905

Please sign in to comment.