diff options
| -rw-r--r-- | ChangeLog | 1 | ||||
| -rwxr-xr-x | tools/Z99-cloud-locale-test.sh | 9 |
2 files changed, 7 insertions, 3 deletions
@@ -98,6 +98,7 @@ device naming via systemd.link. - FreeBSD: add support for installing packages, setting password and timezone. Change default user to 'freebsd'. [Ben Arblaster] + - locale: list unsupported environment settings in warning (LP: #1558069) 0.7.6: - open 0.7.6 diff --git a/tools/Z99-cloud-locale-test.sh b/tools/Z99-cloud-locale-test.sh index 3c51f22d..8e0469ed 100755 --- a/tools/Z99-cloud-locale-test.sh +++ b/tools/Z99-cloud-locale-test.sh @@ -10,7 +10,7 @@ # locale_warn() { - local bad_names="" bad_lcs="" key="" val="" var="" vars="" + local bad_names="" bad_lcs="" key="" val="" var="" vars="" bad_kv="" local w1 w2 w3 w4 remain # if shell is zsh, act like sh only for this function (-L). @@ -37,15 +37,18 @@ locale_warn() { [ "${bad}" = "${var%=*}" ] || continue val=${var#*=} [ "${bad_lcs#* ${val}}" = "${bad_lcs}" ] && - bad_lcs="${bad_lcs} ${val}" + bad_lcs="${bad_lcs} ${val}" + bad_kv="${bad_kv} $bad=$val" break done done bad_lcs=${bad_lcs# } + bad_kv=${bad_kv# } [ -n "$bad_lcs" ] || return 0 printf "_____________________________________________________________________\n" printf "WARNING! Your environment specifies an invalid locale.\n" + printf " The unknown environment variables are:\n %s\n" "$bad_kv" printf " This can affect your user experience significantly, including the\n" printf " ability to manage packages. You may install the locales by running:\n\n" @@ -76,7 +79,7 @@ locale_warn() { printf "\n" fi for bad in ${invalid}; do - printf "WARNING: '${bad}' is an invalid locale\n" + printf "WARNING: '${bad}' is an invalid locale\n" done printf "To see all available language packs, run:\n" |