nix-community/nix-direnv
1
0
Fork 0
mirror of https://github.com/nix-community/nix-direnv.git synced 2025-11-08 11:36:11 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

Improve version testing logic and add relevant tests

Browse source
This commit is contained in:
fidgetingbits 2025-07-19 19:00:53 +08:00
parent add4b907c0
commit 445dc9ffc6
No known key found for this signature in database
14 changed files with 62 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

6
direnvrc
View file

@ -37,10 +37,10 @@ _nix() {
}
_require_version() {
local cmd=$1 version=$2 required=$3
local cmd=$1 raw_version=$2 version=${2%%[^0-9.]*} required=$3
if ! printf "%s\n" "$required" "$version" | LC_ALL=C sort -c -V 2>/dev/null; then
_nix_direnv_error \
"minimum required $(basename "$cmd") version is $required (installed: $version)"
"minimum required $(basename "$cmd") version is $required (installed: $raw_version)"
return 1
fi
}
@ -52,7 +52,7 @@ _require_cmd_version() {
return 1
fi
version=$($cmd --version)
[[ $version =~ ([0-9]+\.[0-9]+\.[0-9]+) ]]
[[ $version =~ ([0-9]+\.[0-9]+(\.[0-9]+)?) ]]
_require_version "$cmd" "${BASH_REMATCH[1]}" "$required"
}