From 792e1578158f5c392e3e1919e1ee45d8054a10b8 Mon Sep 17 00:00:00 2001
From: hesam-init <hesam.init@gmail.com>
Date: Fri, 22 Mar 2024 12:06:04 +0330
Subject: [PATCH] refactor: scripts structure

---
 scripts/{ => setup}/fonts-installer.sh |  2 +-
 scripts/{ => setup}/pkgs-installer.sh  | 11 +----------
 scripts/{utils.sh => utils/main.sh}    |  7 +++++++
 stow.sh                                |  2 +-
 4 files changed, 10 insertions(+), 12 deletions(-)
 rename scripts/{ => setup}/fonts-installer.sh (90%)
 rename scripts/{ => setup}/pkgs-installer.sh (95%)
 rename scripts/{utils.sh => utils/main.sh} (67%)

diff --git a/scripts/fonts-installer.sh b/scripts/setup/fonts-installer.sh
similarity index 90%
rename from scripts/fonts-installer.sh
rename to scripts/setup/fonts-installer.sh
index 2c32d88..f0f97f4 100755
--- a/scripts/fonts-installer.sh
+++ b/scripts/setup/fonts-installer.sh
@@ -1,6 +1,6 @@
 #!/bin/bash
 
-source ./utils.sh
+source ../utils/main.sh
 
 FONTS_DIR="../configs/host/ui/fonts"
 
diff --git a/scripts/pkgs-installer.sh b/scripts/setup/pkgs-installer.sh
similarity index 95%
rename from scripts/pkgs-installer.sh
rename to scripts/setup/pkgs-installer.sh
index 87f8c28..111e36d 100755
--- a/scripts/pkgs-installer.sh
+++ b/scripts/setup/pkgs-installer.sh
@@ -1,6 +1,6 @@
 #!/bin/bash
 
-source ./utils.sh
+source ../utils/main.sh
 
 UPDATE_PKGS=false
 CLEAR_CACHE=false
@@ -24,15 +24,6 @@ declare SERVICES=(
     "crond"
 )
 
-exec 1> >(tee "../hyprland_setup_log")
-
-check() {
-    if [ "$1" != 0 ]; then
-        echo "$2 error : $1" | tee -a ../hyprland_setup_log
-        exit 1
-    fi
-}
-
 update_system() {
     log "Update xbps package manager"
     sudo xbps-install -u xbps
diff --git a/scripts/utils.sh b/scripts/utils/main.sh
similarity index 67%
rename from scripts/utils.sh
rename to scripts/utils/main.sh
index 2a64b8a..632bb79 100755
--- a/scripts/utils.sh
+++ b/scripts/utils/main.sh
@@ -13,3 +13,10 @@ check_sudo() {
         exit 1
     fi
 }
+
+check() {
+    if [ "$1" != 0 ]; then
+        echo "$2 error : $1" | tee -a ../hyprland_setup_log
+        exit 1
+    fi
+}
diff --git a/stow.sh b/stow.sh
index fc9b1cf..14f43d8 100755
--- a/stow.sh
+++ b/stow.sh
@@ -1,6 +1,6 @@
 #!/bin/bash
 
-source ./scripts/utils.sh
+source ./scripts/utils/main.sh
 
 CONFIGS_DIR="$(pwd)/configs"
 DOTFILES_DIR="$CONFIGS_DIR/dotfiles"