pedro/cdist
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

[type/__locale_system] Implement "proper" version comparison

Browse source 
Proper in the sense that it can handle all numeric version numbers even if they
are not floating point (e.g. 16.04.6).
This commit is contained in:
Dennis Camera 2020-08-02 20:17:00 +02:00
parent 885d5a58f4
commit 71710fa00a
1 changed files with 19 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

28
cdist/conf/type/__locale_system/manifest
View file

@ -24,7 +24,20 @@
# Configure system-wide locale by modifying i18n file. # Configure system-wide locale by modifying i18n file.
# #
bccmp() { test "$(bc)" -gt 0; } version_ge() {
awk -F '[^0-9.]' -v target="${1:?}" '
function max(x, y) { return x > y ? x : y }
BEGIN {
getline
nx = split($1, x, ".")
ny = split(target, y, ".")
for (i = 1; i <= max(nx, ny); ++i) {
diff = int(x[i]) - int(y[i])
if (diff == 0) continue
exit (diff < 0)
}
}'
}
key=$__object_id key=$__object_id
@ -43,8 +56,7 @@ os=$(cat "$__global/explorer/os")
case $os case $os
in in
debian) debian)
os_version=$(cat "${__global}/explorer/os_version") if version_ge 4 <"${__global}/explorer/os_version"
if printf '%f >= 4\n' "${os_version}" | bccmp
then then
# Debian 4 (etch) and later # Debian 4 (etch) and later
locale_conf="/etc/default/locale" locale_conf="/etc/default/locale"
@ -56,8 +68,7 @@ in
locale_conf="/etc/default/locale" locale_conf="/etc/default/locale"
;; ;;
ubuntu) ubuntu)
os_version=$(cat "${__global}/explorer/os_version") if version_ge 6.10 <"${__global}/explorer/os_version"
if printf '%f >= 6.10\n' "${os_version}" | bccmp
then then
# Ubuntu 6.10 (edgy) and later # Ubuntu 6.10 (edgy) and later
locale_conf="/etc/default/locale" locale_conf="/etc/default/locale"
@ -71,7 +82,7 @@ in
centos|redhat|scientific) centos|redhat|scientific)
# shellcheck source=/dev/null # shellcheck source=/dev/null
version_id=$(. "${__global}/explorer/os_release" && echo "${VERSION_ID:-0}") version_id=$(. "${__global}/explorer/os_release" && echo "${VERSION_ID:-0}")
if printf '%f >= 7\n' "${version_id}" | bccmp if echo "${version_id}" | version_ge 7
then then
locale_conf="/etc/locale.conf" locale_conf="/etc/locale.conf"
else else
@ -81,7 +92,7 @@ in
fedora) fedora)
# shellcheck source=/dev/null # shellcheck source=/dev/null
version_id=$(. "${__global}/explorer/os_release" && echo "${VERSION_ID:-0}") version_id=$(. "${__global}/explorer/os_release" && echo "${VERSION_ID:-0}")
if printf '%f >= 18\n' "${version_id}" | bccmp if echo "${version_id}" | version_ge 18
then then
locale_conf="/etc/locale.conf" locale_conf="/etc/locale.conf"
quote_value=false quote_value=false
@ -116,8 +127,7 @@ in
locale_conf="/etc/default/init" locale_conf="/etc/default/init"
locale_conf_group="sys" locale_conf_group="sys"
os_version=$(cat "${__global}/explorer/os_version") if version_ge 5.11 <"${__global}/explorer/os_version"
if printf '%f >= 5.11\n' "${os_version}" | bccmp
then then
# mode on Oracle Solaris 11 is actually 0444, # mode on Oracle Solaris 11 is actually 0444,
# but the write bit makes sense, IMO # but the write bit makes sense, IMO