Merge pull request #100 from JaKooLit/Ubuntu-24.04-LTS

Ubuntu 24.04 lts main to dev

install-scripts/00-hypr-pkgs.sh

@@ -97,9 +97,4 @@ done
 ## making brightnessctl work
 sudo chmod +s $(which brightnessctl) 2>&1 | tee -a "$LOG" || true
 
-## Installing pywal colors
-printf "\n%s - Installing Pywal.... \n" "${NOTE}"
-
-sudo pip3 install pywal --break-system-packages 2>&1 | tee -a "$LOG"
-
 clear

install-scripts/hypr-eco.sh

@@ -41,6 +41,6 @@ printf "${NOTE} Installing pyprland\n"
 
 curl https://raw.githubusercontent.com/hyprland-community/pyprland/main/scripts/get-pypr | sh  2>&1 | tee -a "$LOG"
 
-pip install pyprland 2>&1 | tee -a "$LOG" 
+pip install pyprland --break-system-packages 2>&1 | tee -a "$LOG" 
 
 clear

install-scripts/rofi-wayland.sh

@@ -5,6 +5,10 @@
 rofi=(
   bison
   flex
+  pandoc
+  doxygen
+  cppcheck
+  ohcount
 )
 
 ## WARNING: DO NOT EDIT BEYOND THIS LINE IF YOU DON'T KNOW WHAT YOU ARE DOING! ##

install-scripts/swappy.sh

@@ -2,6 +2,11 @@
 # 💫 https://github.com/JaKooLit 💫 #
 # swappy - for screenshot) #
 
+swappy=(
+liblocale-msgfmt-perl
+gettext
+)
+
 ## 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 )"
@@ -18,28 +23,39 @@ MLOG="install-$(date +%d-%H%M%S)_swappy.log"
 
 printf "${NOTE} Installing swappy..\n"
 
-# Check if swappy folder exists
-if [ -d "swappy" ]; then
-  printf "${NOTE} swappy folder exists. Pulling latest changes...\n"
-  cd swappy || exit 1
-  git pull origin master 2>&1 | tee -a "$MLOG"
-else
-  printf "${NOTE} Cloning swappy repository...\n"
-  if git clone https://github.com/jtheoof/swappy.git; then
-    cd swappy || exit 1
-  else
-    echo -e "${ERROR} Download failed for swappy" 2>&1 | tee -a "$LOG"
+for PKG1 in "${swappy[@]}"; 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
+
+##
+printf "${NOTE} Installing swappy from source...\n"  
+
+# Check if folder exists and remove it
+if [ -d "swappy" ]; then
+    printf "${NOTE} deleting existing swappy folder...\n"
+    rm -rf "swappy"
 fi
 
-# Proceed with the installation steps
-meson build
-ninja -C build
-sudo ninja -C build install 2>&1 | tee -a "$MLOG"
-
-# Moving logs into main Install-Logs
-mv "$MLOG" ../Install-Logs/ || true 
-cd - || exit 1
+# Clone and build swappy
+printf "${NOTE} Installing swappy...\n"
+if git clone --depth 1 https://github.com/jtheoof/swappy.git; then
+    cd swappy || exit 1
+	meson setup build
+	ninja -C build
+    if sudo ninja -C build install 2>&1 | tee -a "$MLOG" ; then
+        printf "${OK} swappy installed successfully.\n" 2>&1 | tee -a "$MLOG"
+    else
+        echo -e "${ERROR} Installation failed for swappy." 2>&1 | tee -a "$MLOG"
+    fi
+    #moving the addional logs to Install-Logs directory
+    mv $MLOG ../Install-Logs/ || true 
+    cd ..
+else
+    echo -e "${ERROR} Download failed for swappy." 2>&1 | tee -a "$LOG"
+fi
 
 clear