From ec0a06224cac27331ff3f5867942ffe520939859a04631ae6f58000652c9d04d Mon Sep 17 00:00:00 2001
From: Richard Brown <rbrown@suse.com>
Date: Thu, 23 May 2024 15:01:12 +0000
Subject: [PATCH] - Minor locale bugfixes and cleanup

OBS-URL: https://build.opensuse.org/package/show/devel:microos:aeon/gnome-branding-Aeon?expand=0&rev=17
---
 aeon-firstboot              | 6 +++++-
 gnome-branding-Aeon.changes | 5 +++++
 2 files changed, 10 insertions(+), 1 deletion(-)

diff --git a/aeon-firstboot b/aeon-firstboot
index 4d09454..40f601e 100644
--- a/aeon-firstboot
+++ b/aeon-firstboot
@@ -86,6 +86,7 @@ lastMSG() {
     zenity --info --icon=distributor-logo-Aeon-symbolic --no-wrap --title 'Welcome to openSUSE Aeon' \
       --text 'Congratulations!\n\nYour system is ready to be used\n\nWe hope you enjoy using <b>openSUSE Aeon</b>' \
       --width 300 --height 300
+    rm ~/.config/autostart/aeon-firstboot.desktop
 }
 
 detectLocale() {
@@ -97,6 +98,7 @@ detectLocale() {
 
 show_progress() {
     (
+    sleep 1
     echo "# Waiting for Internet connection"
     until /usr/bin/curl -s --max-time 5 https://flathub.org > /dev/null; do sleep 1; done
     while /usr/bin/pgrep -f '/usr/bin/flatpak|/usr/sbin/transactional-update|/usr/bin/pkexec' >/dev/null; do
@@ -107,7 +109,7 @@ show_progress() {
 }
 
 install_locale() {
-    pkexec sh -c "/usr/sbin/transactional-update -n run zypper aloc ${need_locale} && /usr/sbin/transactional-update -n apply"
+    pkexec sh -c "/usr/sbin/transactional-update -n run zypper -n aloc ${need_locale} && /usr/sbin/transactional-update -n apply"
     if [ "$?" != 0 ] ; then
             zenity --error \
             --text="Installing Locales Failed"
@@ -117,6 +119,8 @@ install_locale() {
  	do
  	   	rmdir $i
     done
+    rm $HOME/.config/user-dirs.dirs
+    rm $HOME/.config/user-dirs.locale
     xdg-user-dirs-update --force
 }
 
diff --git a/gnome-branding-Aeon.changes b/gnome-branding-Aeon.changes
index cb49fda..27de6fb 100644
--- a/gnome-branding-Aeon.changes
+++ b/gnome-branding-Aeon.changes
@@ -1,3 +1,8 @@
+-------------------------------------------------------------------
+Thu May 23 15:00:50 UTC 2024 - Richard Brown <rbrown@suse.com>
+
+- Minor locale bugfixes and cleanup 
+
 -------------------------------------------------------------------
 Thu May 23 12:53:48 UTC 2024 - Richard Brown <rbrown@suse.com>