Further ensures that locale is set

This commit ensures that when checking if `LANG=` is set in `/etc/default/locale` that: 1. stdout and stderr are silenced, and 2. `LANG=` is not commented out (something that could reasonably happen in future releases for documentation) Thank you @dnschneid for the suggestions.
shinriyo · Dec 3, 2018 · 5690844 · 5690844
1 parent c3b93f2
commit 5690844
Showing 1 changed file with 1 addition and 1 deletion.
diff --git a/targets/core b/targets/core
@@ -113,7 +113,7 @@ fixkeyboardmode
 install --minimal sudo wget ca-certificates apt-transport-https
 
 # Generate and set default locale
-if ! grep "LANG=" /etc/default/locale && hash locale-gen 2>/dev/null; then
+if ! grep -q '^[^#]*LANG=' /etc/default/locale 2>/dev/null && hash locale-gen 2>/dev/null; then
     echo 'LANG=en_US.UTF-8' > '/etc/default/locale'
     locale-gen --lang en_US.UTF-8
     if [ "${DISTROAKA:-"$DISTRO"}" = 'debian' ]; then