mirror of
https://github.com/pyenv/pyenv.git
synced 2024-12-11 02:18:35 -05:00
Sort versions semantically in rbenv versions
This commit is contained in:
parent
0767d64344
commit
d3d4606d2f
2 changed files with 20 additions and 3 deletions
|
@ -86,21 +86,36 @@ print_version() {
|
||||||
num_versions=$((num_versions + 1))
|
num_versions=$((num_versions + 1))
|
||||||
}
|
}
|
||||||
|
|
||||||
|
sort_versions() {
|
||||||
|
sed 'h; s/[+-]/./g; s/.p\([[:digit:]]\)/.z.\1/; s/$/.z/; G; s/\n/ /' | \
|
||||||
|
LC_ALL=C sort -t. -k 1,1 -k 2,2n -k 3,3n -k 4,4n -k 5,5n | awk '{print $2}'
|
||||||
|
}
|
||||||
|
|
||||||
# Include "system" in the non-bare output, if it exists
|
# Include "system" in the non-bare output, if it exists
|
||||||
if [ -n "$include_system" ] && RBENV_VERSION=system rbenv-which ruby >/dev/null 2>&1; then
|
if [ -n "$include_system" ] && RBENV_VERSION=system rbenv-which ruby >/dev/null 2>&1; then
|
||||||
print_version system
|
print_version system
|
||||||
fi
|
fi
|
||||||
|
|
||||||
shopt -s nullglob
|
shopt -s nullglob
|
||||||
|
|
||||||
|
versions=($(
|
||||||
for path in "$versions_dir"/*; do
|
for path in "$versions_dir"/*; do
|
||||||
if [ -d "$path" ]; then
|
if [ -d "$path" ]; then
|
||||||
if [ -n "$skip_aliases" ] && [ -L "$path" ]; then
|
if [ -n "$skip_aliases" ] && [ -L "$path" ]; then
|
||||||
target="$(realpath "$path")"
|
target="$(realpath "$path")"
|
||||||
[ "${target%/*}" != "$versions_dir" ] || continue
|
[ "${target%/*}" != "$versions_dir" ] || continue
|
||||||
fi
|
fi
|
||||||
print_version "${path##*/}"
|
echo "${path##*/}"
|
||||||
fi
|
fi
|
||||||
done
|
done
|
||||||
|
))
|
||||||
|
|
||||||
|
sorted_versions=($(printf "%s\n" ${versions[@]} | sort_versions))
|
||||||
|
|
||||||
|
for version in ${sorted_versions[@]}; do
|
||||||
|
print_version $version
|
||||||
|
done
|
||||||
|
|
||||||
shopt -u nullglob
|
shopt -u nullglob
|
||||||
|
|
||||||
if [ "$num_versions" -eq 0 ] && [ -n "$include_system" ]; then
|
if [ "$num_versions" -eq 0 ] && [ -n "$include_system" ]; then
|
||||||
|
|
|
@ -57,14 +57,16 @@ OUT
|
||||||
stub_system_ruby
|
stub_system_ruby
|
||||||
create_version "1.8.7"
|
create_version "1.8.7"
|
||||||
create_version "1.9.3"
|
create_version "1.9.3"
|
||||||
create_version "2.0.0"
|
create_version "2.2.10"
|
||||||
|
create_version "2.2.3"
|
||||||
run rbenv-versions
|
run rbenv-versions
|
||||||
assert_success
|
assert_success
|
||||||
assert_output <<OUT
|
assert_output <<OUT
|
||||||
* system
|
* system
|
||||||
1.8.7
|
1.8.7
|
||||||
1.9.3
|
1.9.3
|
||||||
2.0.0
|
2.2.3
|
||||||
|
2.2.10
|
||||||
OUT
|
OUT
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
Loading…
Reference in a new issue