forked from ungleich-public/cdist
[__locale_system] fix for debian and ubuntu
ubuntu 6.10 and debian etch are 10+ years old and EOL. rather than preserving compatibility I'll just remove it. while /etc/environment works too, correct place is /etc/default/locale (as it was before breaking change). also /etc/debian_version (os_version explorer) may contain minor version with dot (10.5) or string (bullseye/sid).
This commit is contained in:
parent
7e1428ab3c
commit
935f2395bc
1 changed files with 2 additions and 16 deletions
|
@ -40,27 +40,13 @@ os=$(cat "$__global/explorer/os")
|
||||||
case $os
|
case $os
|
||||||
in
|
in
|
||||||
debian)
|
debian)
|
||||||
os_version=$(cat "${__global}/explorer/os_version")
|
locale_conf="/etc/default/locale"
|
||||||
if expr "${os_version}" '>=' 4 >/dev/null
|
|
||||||
then
|
|
||||||
# Debian 4 (etch) and later
|
|
||||||
locale_conf="/etc/default/locale"
|
|
||||||
else
|
|
||||||
locale_conf="/etc/environment"
|
|
||||||
fi
|
|
||||||
;;
|
;;
|
||||||
devuan)
|
devuan)
|
||||||
locale_conf="/etc/default/locale"
|
locale_conf="/etc/default/locale"
|
||||||
;;
|
;;
|
||||||
ubuntu)
|
ubuntu)
|
||||||
os_version=$(cat "${__global}/explorer/os_version")
|
locale_conf="/etc/default/locale"
|
||||||
if expr "${os_version}" '>=' 6.10 >/dev/null
|
|
||||||
then
|
|
||||||
# Ubuntu 6.10 (edgy) and later
|
|
||||||
locale_conf="/etc/default/locale"
|
|
||||||
else
|
|
||||||
locale_conf="/etc/environment"
|
|
||||||
fi
|
|
||||||
;;
|
;;
|
||||||
archlinux)
|
archlinux)
|
||||||
locale_conf="/etc/locale.conf"
|
locale_conf="/etc/locale.conf"
|
||||||
|
|
Loading…
Reference in a new issue