Skip to content

show-utils.sh: fix jq query to get coreutils deps#6300

Merged
BenWiederhake merged 1 commit intouutils:mainfrom
lcheylus:show-utils
May 4, 2024
Merged

show-utils.sh: fix jq query to get coreutils deps#6300
BenWiederhake merged 1 commit intouutils:mainfrom
lcheylus:show-utils

Conversation

@lcheylus
Copy link
Copy Markdown
Contributor

@lcheylus lcheylus commented May 1, 2024 •
edited
Loading

In jq query, the correct regex to select .id is ".*coreutils[ |@]\d+\.\d+\.\d+"

  • with cargo v1.76.0, id = "coreutils 0.0.26 (path+file://<coreutils local directory>)"
  • with cargo v1.77.0, id = "path+file://<coreutils local directory>#coreutils@0.0.26"

Fix #6242

Tests OK on OpenBSD with cargo v1.76 and FreeBSD with cargo v1.77

$ ./util/show-utils.sh
base32 base64 basename basenc cat cksum comm cp csplit cut date dd df dir dircolors dirname du echo env expand expr factor false fmt fold hashsum head join link ln ls mkdir mktemp more mv nl numfmt od paste pr printenv printf ptx pwd readlink realpath rm rmdir seq shred shuf sleep sort split sum tac tail tee test touch tr true truncate tsort unexpand uniq unlink vdir wc yes

$ ./util/show-utils.sh --no-default-features --features "unix"
arch base32 base64 basename basenc cat chgrp chmod chown chroot cksum comm cp csplit cut date dd df dir dircolors dirname du echo env expand expr factor false fmt fold groups hashsum head hostid hostname id install join kill link ln logname ls mkdir mkfifo mknod mktemp more mv nice nl nohup nproc numfmt od paste pathchk pinky pr printenv printf ptx pwd readlink realpath rm rmdir seq shred shuf sleep sort split stat stdbuf stty sum sync tac tail tee test timeout touch tr true truncate tsort tty uname unexpand uniq unlink uptime users vdir wc who whoami yes

@BenWiederhake
Copy link
Copy Markdown
Collaborator

BenWiederhake commented May 1, 2024

You say that on cargo 1.76.0, id is something like coreutils 0.0.26 (path+file://<coreutils local directory>), which does not contain a pound/hash/octothorpe/# at all, yet the regex requires it. So I would expect that it doesn't work. Why does it work?

Also, I have a feeling that this regex has been "fixed" more than once in the past, could you add some concrete examples of strings that the regex needs to match, as a comment? This would provide some light assurance that we don't regress when the next "fix" lands.

@lcheylus
show-utils.sh: fix jq query to get coreutils deps
d358fec 
In jq query, the correct regex to select .id is ".*coreutils[ |@]\\d+\\.\\d+\\.\\d+"

- with cargo v1.76, id = "coreutils 0.0.26 (path+file://<coreutils local directory>)"
- with cargo v1.77, id = "path+file://<coreutils local directory>#coreutils@0.0.26"

Fix uutils#6242

Signed-off-by: Laurent Cheylus <foxy@free.fr>
@lcheylus
Copy link
Copy Markdown
Contributor Author

lcheylus commented May 4, 2024

Sorry I have made an error in my first commit message : the correct regex to select coreutils is is ".*coreutils[ |@]\d+\.\d+\.\d+" (without # hash/pound).

I have pushed a new version of my fix + comments for the different outputs or cargo metadata to find coreutils id with jq / regex.

BenWiederhake
BenWiederhake approved these changes May 4, 2024
View reviewed changes
Copy link
Copy Markdown
Collaborator

@BenWiederhake BenWiederhake left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM :)

@github-actions
Copy link
Copy Markdown

github-actions Bot commented May 4, 2024

GNU testsuite comparison:

Skipping an intermittent issue tests/tail/inotify-dir-recreate (passes in this run but fails in the 'main' branch)

@BenWiederhake
Copy link
Copy Markdown
Collaborator

BenWiederhake commented May 4, 2024

Remaining failures are #6275 and #6333, which is out-of-scope for this PR.

@BenWiederhake BenWiederhake merged commit 3b96ff1 into uutils:main May 4, 2024
@lcheylus lcheylus deleted the show-utils branch May 4, 2024 17:06
@BrewTestBot BrewTestBot mentioned this pull request Jun 23, 2024
Merged
@moonfruit moonfruit mentioned this pull request Jun 24, 2024
Merged
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@BenWiederhake BenWiederhake BenWiederhake approved these changes

Assignees

No one assigned

Labels

None yet

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

Error with util/show-utils.sh script if main directory != coreutils

2 participants

@lcheylus @BenWiederhake