From 64b115d76e4e90712cc2b8dc27c60eedf95d3fc3 Mon Sep 17 00:00:00 2001
From: Anthony Perkins <anthony@acperkins.com>
Date: Wed, 10 Feb 2021 00:44:11 +0000
Subject: [PATCH] Unset acctsvclang and reorder locale detection

---
 roles/home-cli/files/shrc | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/roles/home-cli/files/shrc b/roles/home-cli/files/shrc
index 85244b6..b081145 100644
--- a/roles/home-cli/files/shrc
+++ b/roles/home-cli/files/shrc
@@ -72,11 +72,12 @@ acctsvclang=$(dbus-send \
     | awk '{print $2}')
 if [ -n "$acctsvclang" ]; then
     LANG=$acctsvclang
-elif [ -r "$HOME/.config/user-dirs.locale" ]; then
-    LANG="$(cat $HOME/.config/user-dirs.locale).UTF-8"
 elif [ -r "$HOME/.config/locale.conf" ]; then
     . "$HOME/.config/locale.conf"
+elif [ -r "$HOME/.config/user-dirs.locale" ]; then
+    LANG="$(cat $HOME/.config/user-dirs.locale).UTF-8"
 fi
+unset acctsvclang
 case "$LANG" in
     "en_GB.UTF-8")
         LANGUAGE="en_GB:en"