From c1c23a4cca3116d18e196198176ff9f6b0490a1a Mon Sep 17 00:00:00 2001 From: Michael Boelen Date: Tue, 20 Aug 2019 14:18:15 +0200 Subject: Only test if we have locale command, which is not always available (like Alpine in Docker container) --- lynis | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'lynis') diff --git a/lynis b/lynis index eb05bf9e..29c28919 100755 --- a/lynis +++ b/lynis @@ -213,14 +213,14 @@ # # Auto detection of language based on shell LANG variable. This is required by the Display() function to deal with multi-bytes characters. DISPLAY_LANG="${LANG:-}" - # Try locale command if shell variable had no value - if [ -z "${DISPLAY_LANG}" ]; then - DISPLAY_LANG=$(locale | egrep "^LANG=" | cut -d= -f2) - fi # Extract the short notation of the language (first two characters). if [ -x "$(command -v locale 2> /dev/null)" ]; then LANGUAGE=$(locale | egrep "^LANG=" | cut -d= -f2 | cut -d_ -f1 | egrep "^[a-z]{2}$") + # Try locale command if shell variable had no value + if [ -z "${DISPLAY_LANG}" ]; then + DISPLAY_LANG=$(locale | egrep "^LANG=" | cut -d= -f2) + fi fi # Set default language: 'en' (English) if no value is set -- cgit v1.2.3