pub fn uu_app() -> Commanddiff --git a/dev/src/uu_cut/cut.rs.html b/dev/src/uu_cut/cut.rs.html index 9bb02840f..afb34dcb6 100644 --- a/dev/src/uu_cut/cut.rs.html +++ b/dev/src/uu_cut/cut.rs.html @@ -582,91 +582,6 @@ 582 583 584 -585 -586 -587 -588 -589 -590 -591 -592 -593 -594 -595 -596 -597 -598 -599 -600 -601 -602 -603 -604 -605 -606 -607 -608 -609 -610 -611 -612 -613 -614 -615 -616 -617 -618 -619 -620 -621 -622 -623 -624 -625 -626 -627 -628 -629 -630 -631 -632 -633 -634 -635 -636 -637 -638 -639 -640 -641 -642 -643 -644 -645 -646 -647 -648 -649 -650 -651 -652 -653 -654 -655 -656 -657 -658 -659 -660 -661 -662 -663 -664 -665 -666 -667 -668 -669
// This file is part of the uutils coreutils package.
//
// (c) Rolf Morel <rolfmorel@gmail.com>
@@ -688,99 +603,14 @@
use self::searcher::Searcher;
use matcher::{ExactMatcher, Matcher, WhitespaceMatcher};
use uucore::ranges::Range;
-use uucore::{format_usage, show, show_error, show_if_err};
+use uucore::{format_usage, help_about, help_section, help_usage, show, show_error, show_if_err};
mod matcher;
mod searcher;
-static USAGE: &str =
- "{} [-d|-w] [-s] [-z] [--output-delimiter] ((-f|-b|-c) {{sequence}}) {{sourcefile}}+";
-static ABOUT: &str =
- "Prints specified byte or field columns from each line of stdin or the input files";
-static LONG_HELP: &str = "
- Each call must specify a mode (what to use for columns),
- a sequence (which columns to print), and provide a data source
-
- Specifying a mode
-
- Use --bytes (-b) or --characters (-c) to specify byte mode
-
- Use --fields (-f) to specify field mode, where each line is broken into
- fields identified by a delimiter character. For example for a typical CSV
- you could use this in combination with setting comma as the delimiter
-
- Specifying a sequence
-
- A sequence is a group of 1 or more numbers or inclusive ranges separated
- by a commas.
-
- cut -f 2,5-7 some_file.txt
- will display the 2nd, 5th, 6th, and 7th field for each source line
-
- Ranges can extend to the end of the row by excluding the the second number
-
- cut -f 3- some_file.txt
- will display the 3rd field and all fields after for each source line
-
- The first number of a range can be excluded, and this is effectively the
- same as using 1 as the first number: it causes the range to begin at the
- first column. Ranges can also display a single column
-
- cut -f 1,3-5 some_file.txt
- will display the 1st, 3rd, 4th, and 5th field for each source line
-
- The --complement option, when used, inverts the effect of the sequence
-
- cut --complement -f 4-6 some_file.txt
- will display the every field but the 4th, 5th, and 6th
-
- Specifying a data source
-
- If no sourcefile arguments are specified, stdin is used as the source of
- lines to print
-
- If sourcefile arguments are specified, stdin is ignored and all files are
- read in consecutively if a sourcefile is not successfully read, a warning
- will print to stderr, and the eventual status code will be 1, but cut
- will continue to read through proceeding sourcefiles
-
- To print columns from both STDIN and a file argument, use - (dash) as a
- sourcefile argument to represent stdin.
-
- Field Mode options
-
- The fields in each line are identified by a delimiter (separator)
-
- Set the delimiter
- Set the delimiter which separates fields in the file using the
- --delimiter (-d) option. Setting the delimiter is optional.
- If not set, a default delimiter of Tab will be used.
-
- If the -w option is provided, fields will be separated by any number
- of whitespace characters (Space and Tab). The output delimiter will
- be a Tab unless explicitly specified. Only one of -d or -w option can be specified.
- This is an extension adopted from FreeBSD.
-
- Optionally Filter based on delimiter
- If the --only-delimited (-s) flag is provided, only lines which
- contain the delimiter will be printed
-
- Replace the delimiter
- If the --output-delimiter option is provided, the argument used for
- it will replace the delimiter character in each line printed. This is
- useful for transforming tabular data - e.g. to convert a CSV to a
- TSV (tab-separated file)
-
- Line endings
-
- When the --zero-terminated (-z) option is used, cut sees \\0 (null) as the
- 'line ending' character (both for the purposes of reading lines and
- separating printed lines) instead of \\n (newline). This is useful for
- tabular data where some of the cells may contain newlines
-
- echo 'ab\\0cd' | cut -z -c 1
- will result in 'a\\0c\\0'
-";
+const USAGE: &str = help_usage!("cut.md");
+const ABOUT: &str = help_about!("cut.md");
+const AFTER_HELP: &str = help_section!("after help", "cut.md");
struct Options {
out_delim: Option<String>,
@@ -1263,7 +1093,7 @@
.version(crate_version!())
.override_usage(format_usage(USAGE))
.about(ABOUT)
- .after_help(LONG_HELP)
+ .after_help(AFTER_HELP)
.infer_long_args(true)
.arg(
Arg::new(options::BYTES)
diff --git a/dev/src/uu_hostid/hostid.rs.html b/dev/src/uu_hostid/hostid.rs.html
index 818b80920..6d8951110 100644
--- a/dev/src/uu_hostid/hostid.rs.html
+++ b/dev/src/uu_hostid/hostid.rs.html
@@ -63,10 +63,10 @@
use clap::{crate_version, Command};
use libc::c_long;
-use uucore::{error::UResult, format_usage};
+use uucore::{error::UResult, format_usage, help_about, help_usage};
-const USAGE: &str = "{} [options]";
-const ABOUT: &str = "Print the numeric identifier (in hexadecimal) for the current host";
+const USAGE: &str = help_usage!("hostid.md");
+const ABOUT: &str = help_about!("hostid.md");
// currently rust libc interface doesn't include gethostid
extern "C" {
diff --git a/dev/src/uu_users/users.rs.html b/dev/src/uu_users/users.rs.html
index 1a5a9c138..ce4645fe5 100644
--- a/dev/src/uu_users/users.rs.html
+++ b/dev/src/uu_users/users.rs.html
@@ -89,11 +89,11 @@
use clap::builder::ValueParser;
use clap::{crate_version, Arg, Command};
use uucore::error::UResult;
-use uucore::format_usage;
use uucore::utmpx::{self, Utmpx};
+use uucore::{format_usage, help_about, help_usage};
-static ABOUT: &str = "Print the user names of users currently logged in to the current host";
-const USAGE: &str = "{} [FILE]";
+const ABOUT: &str = help_about!("users.md");
+const USAGE: &str = help_usage!("users.md");
static ARG_FILES: &str = "files";
diff --git a/dev/uu_cut/fn.uu_app.html b/dev/uu_cut/fn.uu_app.html
index ba73cf57d..21cf54a00 100644
--- a/dev/uu_cut/fn.uu_app.html
+++ b/dev/uu_cut/fn.uu_app.html
@@ -1 +1 @@
-uu_app in uu_cut - Rust
\ No newline at end of file
+uu_app in uu_cut - Rust
\ No newline at end of file
diff --git a/dev/uu_cut/fn.uumain.html b/dev/uu_cut/fn.uumain.html
index bd4973cce..c19761d1c 100644
--- a/dev/uu_cut/fn.uumain.html
+++ b/dev/uu_cut/fn.uumain.html
@@ -1 +1 @@
-uumain in uu_cut - Rust
\ No newline at end of file
+uumain in uu_cut - Rust
\ No newline at end of file
diff --git a/dev/uu_cut/index.html b/dev/uu_cut/index.html
index bf443e551..4a34682ab 100644
--- a/dev/uu_cut/index.html
+++ b/dev/uu_cut/index.html
@@ -1 +1 @@
-uu_cut - Rust
\ No newline at end of file
+uu_cut - Rust
\ No newline at end of file