From 195970bcbce1aaf5ed817e9b37095903abb0d71e Mon Sep 17 00:00:00 2001
From: JaKooLit <ejhay.games@gmail.com>
Date: Mon, 3 Feb 2025 17:39:52 +0900
Subject: [PATCH] AGS to install only if not installed with v1.9.0

---
 install-scripts/Global_functions.sh | 13 +++++--
 install-scripts/ags.sh              | 59 ++++++++++++++++++-----------
 2 files changed, 46 insertions(+), 26 deletions(-)

diff --git a/install-scripts/Global_functions.sh b/install-scripts/Global_functions.sh
index 92a48a2..e37542f 100755
--- a/install-scripts/Global_functions.sh
+++ b/install-scripts/Global_functions.sh
@@ -13,12 +13,17 @@ set -e
 OK="$(tput setaf 2)[OK]$(tput sgr0)"
 ERROR="$(tput setaf 1)[ERROR]$(tput sgr0)"
 NOTE="$(tput setaf 3)[NOTE]$(tput sgr0)"
+INFO="$(tput setaf 4)[INFO]$(tput sgr0)"
 WARN="$(tput setaf 1)[WARN]$(tput sgr0)"
 CAT="$(tput setaf 6)[ACTION]$(tput sgr0)"
-MAGENTA=$(tput setaf 5)
-WARNING=$(tput setaf 1)
-YELLOW=$(tput setaf 3)
-RESET=$(tput sgr0)
+MAGENTA="$(tput setaf 5)"
+ORANGE="$(tput setaf 214)"
+WARNING="$(tput setaf 1)"
+YELLOW="$(tput setaf 3)"
+GREEN="$(tput setaf 2)"
+BLUE="$(tput setaf 4)"
+SKY_BLUE="$(tput setaf 6)"
+RESET="$(tput sgr0)"
 
 
 # Function for installing packages
diff --git a/install-scripts/ags.sh b/install-scripts/ags.sh
index 2d2906f..6518a3d 100755
--- a/install-scripts/ags.sh
+++ b/install-scripts/ags.sh
@@ -1,6 +1,16 @@
 #!/bin/bash
 # 💫 https://github.com/JaKooLit 💫 #
-# Aylur's GTK Shell #
+# Aylur's GTK Shell v 1.9.0 #
+# for desktop overview
+
+# Check if AGS is installed
+if command -v ags &>/dev/null; then
+    AGS_VERSION=$(ags -v | awk '{print $NF}') 
+    if [[ "$AGS_VERSION" == "1.9.0" ]]; then
+        echo -e "${OK} ${MAGENTA}Aylur's GTK Shell v1.9.0${RESET} is already installed. Skipping installation."
+        exit 0
+    fi
+fi
 
 ags=(
     node-typescript 
@@ -33,21 +43,24 @@ source "$(dirname "$(readlink -f "$0")")/Global_functions.sh"
 LOG="Install-Logs/install-$(date +%d-%H%M%S)_ags.log"
 MLOG="install-$(date +%d-%H%M%S)_ags2.log"
 
+printf "\n%.0s" {1..1}
+
+# Installation of main components
+printf "\n%s - Installing ${BLUE}Aylur's GTK shell $ags_tag${RESET} Dependencies \n" "${NOTE}"
+
 # Installing ags Dependencies
 for PKG1 in "${ags[@]}"; do
-  install_package "$PKG1" 2>&1 | tee -a "$LOG"
-  if [ $? -ne 0 ]; then
-    echo -e "\033[1A\033[K${ERROR} - $PKG1 Package installation failed, Please check the installation logs"
-    exit 1
-  fi
+    install_package "$PKG1" "$LOG"
+    if [ $? -ne 0 ]; then
+        echo -e "\033[1A\033[K${ERROR} - $PKG1 Package installation failed, Please check the installation logs"
+        exit 1
+    fi
 done
 
-#install typescript by npm
-sudo npm install --global typescript 2>&1 | tee -a "$LOG"
+printf "\n%.0s" {1..1}
 
-# ags
-
-printf "${NOTE} Install and Compiling Aylurs GTK shell $ags_tag.. \n"
+# ags v1
+printf "${NOTE} Install and Compiling ${BLUE}Aylur's GTK shell $ags_tag${RESET}..\n"
 
 # Check if folder exists and remove it
 if [ -d "ags" ]; then
@@ -55,24 +68,26 @@ if [ -d "ags" ]; then
     rm -rf "ags"
 fi
 
-# Clone nwg-look repository with the specified tag
+printf "\n%.0s" {1..1}
+printf "${INFO} Kindly Standby...cloning and compiling ${BLUE}Aylur's GTK shell $ags_tag${RESET}...\n"
+printf "\n%.0s" {1..1}
+# Clone repository with the specified tag and capture git output into MLOG
 if git clone --recursive -b "$ags_tag" --depth 1 https://github.com/Aylur/ags.git; then
     cd ags || exit 1
-    # Build and install ags
-	npm install
-	meson setup build
-    if sudo meson install -C build 2>&1 | tee -a "$MLOG"; then
-        printf "${OK} ags installed successfully.\n" 2>&1 | tee -a "$MLOG"
-    else
-        echo -e "${ERROR} Installation failed for ags" 2>&1 | tee -a "$MLOG"
-    fi
-
+    npm install
+    meson setup build
+   if sudo meson install -C build 2>&1 | tee -a "$MLOG"; then
+    printf "\n${OK} ${YELLOW}Aylur's GTK shell $ags_tag${RESET} installed successfully.\n" 2>&1 | tee -a "$MLOG"
+  else
+    echo -e "\n${ERROR} ${YELLOW}Aylur's GTK shell $ags_tag${RESET} Installation failed\n " 2>&1 | tee -a "$MLOG"
+   fi
     # Move logs to Install-Logs directory
     mv "$MLOG" ../Install-Logs/ || true
     cd ..
 else
-    echo -e "${ERROR} Failed to download ags Please check your connection" 2>&1 | tee -a "$LOG"
+    echo -e "\n${ERROR} Failed to download ${YELLOW}Aylur's GTK shell $ags_tag${RESET} Please check your connection\n" 2>&1 | tee -a "$LOG"
     mv "$MLOG" ../Install-Logs/ || true
     exit 1
 fi
 
+printf "\n%.0s" {1..2}
\ No newline at end of file