From f57842bd3644602cedb856fa7f8f974cca7e7205 Mon Sep 17 00:00:00 2001
From: JaKooLit <jimmielovejay@gmail.com>
Date: Sat, 4 May 2024 23:57:17 +0900
Subject: [PATCH] Made a separate script for fonts installation for easy
 debugging purpose

---
 CHANGELOGS.md                   |  3 +++
 install-scripts/00-hypr-pkgs.sh | 12 +--------
 install-scripts/fonts.sh        | 46 +++++++++++++++++++++++++++++++++
 install.sh                      |  3 +++
 4 files changed, 53 insertions(+), 11 deletions(-)
 create mode 100755 install-scripts/fonts.sh

diff --git a/CHANGELOGS.md b/CHANGELOGS.md
index ad042fd..34ceab0 100644
--- a/CHANGELOGS.md
+++ b/CHANGELOGS.md
@@ -1,5 +1,8 @@
 ## Changelogs
 
+## 04 May 2024
+- separated fonts installation script for easy debugging
+
 ## 03 May 2024
 - added python3-pyquery for new weather-waybar python based on Hyprland-Dots
 
diff --git a/install-scripts/00-hypr-pkgs.sh b/install-scripts/00-hypr-pkgs.sh
index 74e1ec4..eb573a0 100755
--- a/install-scripts/00-hypr-pkgs.sh
+++ b/install-scripts/00-hypr-pkgs.sh
@@ -68,16 +68,6 @@ vim
 yt-dlp
 )
 
-fonts=(
-adobe-source-code-pro-fonts 
-noto-fonts-emoji
-otf-font-awesome 
-ttf-droid 
-ttf-fira-code
-ttf-jetbrains-mono 
-ttf-jetbrains-mono-nerd 
-)
-
 # List of packages to uninstall as it conflicts with swaync or causing swaync to not function properly
 uninstall=(
   dunst
@@ -101,7 +91,7 @@ LOG="Install-Logs/install-$(date +%d-%H%M%S)_hypr-pkgs.log"
 # Installation of main components
 printf "\n%s - Installing hyprland packages.... \n" "${NOTE}"
 
-for PKG1 in "${hypr_package[@]}" "${hypr_package_2[@]}" "${fonts[@]}" "${Extra[@]}"; do
+for PKG1 in "${hypr_package[@]}" "${hypr_package_2[@]}" "${Extra[@]}"; do
   install_package "$PKG1" 2>&1 | tee -a "$LOG"
   if [ $? -ne 0 ]; then
     echo -e "\e[1A\e[K${ERROR} - $PKG1 Package installation failed, Please check the installation logs"
diff --git a/install-scripts/fonts.sh b/install-scripts/fonts.sh
new file mode 100755
index 0000000..57ec06a
--- /dev/null
+++ b/install-scripts/fonts.sh
@@ -0,0 +1,46 @@
+#!/bin/bash
+# 💫 https://github.com/JaKooLit 💫 #
+# Fonts #
+
+# These fonts are minimun required for pre-configured dots to work. You can add here as required
+# WARNING! If you remove packages here, dotfiles may not work properly.
+# and also, ensure that packages are present in AUR and official Arch Repo
+
+fonts=(
+adobe-source-code-pro-fonts 
+noto-fonts-emoji
+otf-font-awesome 
+ttf-droid 
+ttf-fira-code
+ttf-jetbrains-mono 
+ttf-jetbrains-mono-nerd 
+)
+
+
+## WARNING: DO NOT EDIT BEYOND THIS LINE IF YOU DON'T KNOW WHAT YOU ARE DOING! ##
+# Determine the directory where the script is located
+SCRIPT_DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
+
+# Change the working directory to the parent directory of the script
+PARENT_DIR="$SCRIPT_DIR/.."
+cd "$PARENT_DIR" || exit 1
+
+source "$(dirname "$(readlink -f "$0")")/Global_functions.sh"
+
+# Set the name of the log file to include the current date and time
+LOG="Install-Logs/install-$(date +%d-%H%M%S)_fonts.log"
+
+
+# Installation of main components
+printf "\n%s - Installing necessary fonts.... \n" "${NOTE}"
+
+for PKG1 in "${fonts[@]}"; do
+  install_package "$PKG1" 2>&1 | tee -a "$LOG"
+  if [ $? -ne 0 ]; then
+    echo -e "\e[1A\e[K${ERROR} - $PKG1 Package installation failed, Please check the installation logs"
+    exit 1
+  fi
+done
+
+clear
+
diff --git a/install.sh b/install.sh
index 5d6c9fd..22e29c1 100755
--- a/install.sh
+++ b/install.sh
@@ -188,6 +188,9 @@ execute_script "00-hypr-pkgs.sh"
 # Install pipewire and pipewire-audio
 execute_script "pipewire.sh"
 
+# Install necessary fonts
+execute_script "fonts.sh"
+
 # Install hyprland
 execute_script "hyprland.sh"