diff --git a/mysqld.init b/mysqld.init index 613ee24..fd23bc1 100644 --- a/mysqld.init +++ b/mysqld.init @@ -38,19 +38,13 @@ charset() || echo "Unable to find charset: $CHSET" fi unset LANG LANGUAGE LC_ALL - default_charset="$(HOME=/var/empty . /etc/profile.d/lang.sh && locale |sed -ne 's/^LC_COLLATE="\?[^".]\+\.\([^"]\+\)"\?$/\1/p')" + default_charset="$(HOME=/var/empty . /etc/profile.d/lang.sh && locale \ + | sed -ne 's/^LC_COLLATE="\?[^".]\+\.\([^"]\+\)"\?$/\1/p' \ + | tr '[:upper:]' '[:lower:]' \ + | tr -d '-')" case "$default_charset" in - CP1251) - CHSET=cp1251 - ;; - KOI8-R) - CHSET=koi8r - ;; - KOI8-U) - CHSET=koi8u - ;; - UTF-8) - CHSET=utf8 + cp1251|koi8r|koi8u|utf8) + CHSET="$default_charset" ;; *) echo "Unable to find proper charset from system locale, setting 'utf8'."