Skip to content

Commit b2c00de

Browse files
Merge branch 'uutils:main' into main
2 parents 839ba4f + 8f62357 commit b2c00de

File tree

31 files changed

+817
-176
lines changed

31 files changed

+817
-176
lines changed

.github/workflows/CICD.yml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -590,7 +590,8 @@ jobs:
590590
- { os: ubuntu-latest , target: x86_64-unknown-linux-gnu , features: "feat_os_unix,test_risky_names", use-cross: use-cross }
591591
- { os: ubuntu-latest , target: x86_64-unknown-linux-gnu , features: "feat_os_unix,uudoc" , use-cross: no, workspace-tests: true }
592592
- { os: ubuntu-latest , target: x86_64-unknown-linux-musl , features: feat_os_unix_musl , use-cross: use-cross }
593-
- { os: ubuntu-latest , target: x86_64-unknown-redox , features: feat_os_unix_redox , use-cross: redoxer , skip-tests: true }
593+
# broken by network error
594+
# - { os: ubuntu-latest , target: x86_64-unknown-redox , features: feat_os_unix_redox , use-cross: redoxer , skip-tests: true }
594595
- { os: ubuntu-latest , target: wasm32-unknown-unknown , default-features: false, features: uucore/format, skip-tests: true, skip-package: true, skip-publish: true }
595596
- { os: macos-latest , target: aarch64-apple-darwin , features: feat_os_macos, workspace-tests: true } # M1 CPU
596597
# PR #7964: Mac should still build even if the feature is not enabled

.github/workflows/benchmarks.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,7 @@ jobs:
2424
matrix:
2525
benchmark-target:
2626
- { package: uu_base64 }
27+
- { package: uu_cksum }
2728
- { package: uu_cp }
2829
- { package: uu_cut }
2930
- { package: uu_du }

.github/workflows/freebsd.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ jobs:
4141
- name: Run sccache-cache
4242
uses: mozilla-actions/sccache-action@v0.0.9
4343
- name: Prepare, build and test
44-
uses: vmactions/freebsd-vm@v1.2.4
44+
uses: vmactions/freebsd-vm@v1.2.5
4545
with:
4646
usesh: true
4747
sync: rsync
@@ -135,7 +135,7 @@ jobs:
135135
- name: Run sccache-cache
136136
uses: mozilla-actions/sccache-action@v0.0.9
137137
- name: Prepare, build and test
138-
uses: vmactions/freebsd-vm@v1.2.4
138+
uses: vmactions/freebsd-vm@v1.2.5
139139
with:
140140
usesh: true
141141
sync: rsync

Cargo.lock

Lines changed: 13 additions & 13 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Cargo.toml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -390,7 +390,6 @@ sha3 = "0.10.8"
390390
blake2b_simd = "1.0.2"
391391
blake3 = "1.5.1"
392392
sm3 = "0.4.2"
393-
crc32fast = "1.4.2"
394393
crc-fast = "1.5.0"
395394
digest = "0.10.7"
396395

README.md

Lines changed: 13 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -134,11 +134,13 @@ example:
134134
cargo build --features "base32 cat echo rm" --no-default-features
135135
```
136136

137-
If you don't want to build the multicall binary and would prefer to build the
138-
utilities as individual binaries, that is also possible. Each utility is
139-
contained in its own package within the main repository, named "uu_UTILNAME". To
140-
build individual utilities, use cargo to build just the specific packages (using
141-
the `--package` [aka `-p`] option). For example:
137+
If you want to build the utilities as individual binaries, that is also possible:
138+
139+
```shell
140+
cargo build --release --bins --workspace --exclude coreutils --exclude uu_runcon --exclude uu_chcon
141+
```
142+
Each utility is contained in its own package within the main repository, named "uu_UTILNAME". To
143+
build selected individual utilities, use the `--package` [aka `-p`] option. For example:
142144

143145
```shell
144146
cargo build -p uu_base32 -p uu_cat -p uu_echo -p uu_rm
@@ -246,16 +248,16 @@ make COMPLETIONS=n MANPAGES=n install
246248

247249
### Manually install shell completions
248250

249-
The `coreutils` binary can generate completions for the `bash`, `elvish`,
250-
`fish`, `powershell` and `zsh` shells. It prints the result to stdout.
251-
252-
The syntax is:
251+
The `uudoc` binary generates completions for the `bash`, `elvish`,
252+
`fish`, `powershell` and `zsh` shells to stdout.
253253

254+
Install `uudoc` by
254255
```shell
255-
# Install uudoc first
256256
cargo install --bin uudoc --features uudoc --path .
257+
```
257258

258-
# Then use the installed binary
259+
Then use the installed binary:
260+
```shell
259261
uudoc completion <utility> <shell>
260262
```
261263

@@ -276,10 +278,6 @@ env PROG_PREFIX=uu- uudoc completion cp zsh
276278
To generate manpages, the syntax is:
277279

278280
```bash
279-
# Install uudoc first
280-
cargo install --bin uudoc --features uudoc --path .
281-
282-
# Then use the installed binary
283281
uudoc manpage <utility>
284282
```
285283

docs/src/extensions.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -47,12 +47,12 @@ packages.
4747

4848
`rm` can display a progress bar when the `-g`/`--progress` flag is set.
4949

50-
## `hashsum`
50+
## `hashsum` (deprecated)
5151

5252
This utility does not exist in GNU coreutils. `hashsum` is a utility that
5353
supports computing the checksums with several algorithms. The flags and options
5454
are identical to the `*sum` family of utils (`sha1sum`, `sha256sum`, `b2sum`,
55-
etc.).
55+
etc.). This utility will be removed in the future and it is advised to use `cksum --untagged` instead.
5656

5757
## `b3sum`
5858

0 commit comments

Comments
 (0)