From b63ccc88a3c2567af9259ad5d941bc1f85f8c7c4 Mon Sep 17 00:00:00 2001
From: Stephan Raabe <mail@stephan-raabe.de>
Date: Mon, 25 Dec 2023 15:02:36 +0100
Subject: [PATCH] Updates

---
 .install/cleanup.sh   | 11 +++++++++++
 .install/installer.sh |  8 ++++----
 install.sh            |  1 +
 3 files changed, 16 insertions(+), 4 deletions(-)
 create mode 100644 .install/cleanup.sh

diff --git a/.install/cleanup.sh b/.install/cleanup.sh
new file mode 100644
index 0000000..7270c22
--- /dev/null
+++ b/.install/cleanup.sh
@@ -0,0 +1,11 @@
+# ------------------------------------------------------
+# Install tty login and issue
+# ------------------------------------------------------
+
+# Check for ttf-ms-fonts
+if [[ $(_isInstalledPacman "ttf-ms-fonts") == 0 ]]; then
+    echo "The script has detected ttf-ms-fonts. This can cause conflicts with icons in Waybar."
+    if gum confirm "Do you want to uninstall ttf-ms-fonts?" ;then
+        sudo pacman --noconfirm -R ttf-ms-fonts
+    fi
+fi
\ No newline at end of file
diff --git a/.install/installer.sh b/.install/installer.sh
index 69a8248..24e19e4 100644
--- a/.install/installer.sh
+++ b/.install/installer.sh
@@ -6,8 +6,8 @@ figlet "Packages"
 echo -e "${NONE}"
 if [ -d ~/dotfiles ] ;then
     echo "Do you want to check for new packages only (faster installation)"
-    echo "or do you want to reinstall all packages again? (can help to fix issues)"
-    if gum confirm "How do you want to proceed?" --affirmative "Check for new packages only" --negative "Reinstall and add new packages" ;then
+    echo "or do you want to reinstall all packages again? (more robust and can help to fix issues)"
+    if gum confirm "How do you want to proceed?" --affirmative "New packages only" --negative "Force reinstallation" ;then
         force_install=0
     elif [ $? -eq 130 ]; then
         echo "Installation canceled."
@@ -16,9 +16,9 @@ if [ -d ~/dotfiles ] ;then
         force_install=1
     fi
 else
-    echo "Do you want to reinstall all already installed packages and install the required new packages? (recommended)"
+    echo "Do you want to reinstall all already installed packages and install the required new packages? (recommended and more robust)"
     echo "or do you want to install the new required packages only? (could be faster installation)"
-    if gum confirm "How do you want to proceed?" --affirmative "Reinstall and add new packages" --negative "Check for new packages only" ;then
+    if gum confirm "How do you want to proceed?" --affirmative "Reinstall all packages" --negative "Install new packages only" ;then
         force_install=1
     elif [ $? -eq 130 ]; then
         echo "Installation canceled."
diff --git a/install.sh b/install.sh
index c7c6733..32b3058 100755
--- a/install.sh
+++ b/install.sh
@@ -69,4 +69,5 @@ if [[ $profile == *"Qtile"* ]]; then
 fi
 source .install/bashrc.sh
 source .install/monitor.sh
+source .install/cleanup.sh
 source .install/done.sh