install-scripts/00-dependencies.sh

@@ -79,7 +79,6 @@ dependencies=(
     libxkbcommon-x11-dev
     libxkbregistry-dev
     libxml2-dev
-    libsdbus-c++-dev
     libxxhash-dev
     meson
     ninja-build

install-scripts/hyprgraphics.sh

@@ -3,9 +3,6 @@
 # Hypr Ecosystem #
 # hyprgraphics #
 
-hyprgraphics=(
-	libmagic
-)
 
 #specific branch or release
 graphics_tag="v0.1.5"
@@ -30,15 +27,6 @@ MLOG="install-$(date +%d-%H%M%S)_hyprgraphics2.log"
 # Installation of dependencies
 printf "\n%s - Installing ${YELLOW}hyprgraphics dependencies${RESET} .... \n" "${INFO}"
 
-for PKG1 in "${hyprgraphics[@]}"; do
-  re_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 "\n%.0s" {1..1}
-
 # Check if hyprgraphics directory exists and remove it
 if [ -d "hyprgraphics" ]; then
     rm -rf "hyprgraphics"

install-scripts/hyprland-qt-support.sh

@@ -8,10 +8,6 @@ qt_support=(
 	qt6-wayland
 	qt6-declarative-dev
 	qml6-module-qtcore
-    qml6-module-qtquick-layouts
-    qt6-tools-dev
-    qt6-tools-dev-tools
-    qt6-charts-dev
 )
 
 #specific branch or release

install-scripts/hyprland-qtutils.sh

@@ -6,14 +6,11 @@
 qtutils=(
 	libqt6core5compat6
     qt6-base-dev
-	qt6-wayland-dev
 	qt6-wayland
 	qt6-declarative-dev
 	qml6-module-qtcore
 	qt6-3d-dev
 	qt6-5compat-dev
-    libqt6waylandclient6
-    qml6-module-qtwayland-client-texturesharing
 )
 
 #specific branch or release

install-scripts/hyprland.sh

@@ -45,7 +45,7 @@ printf "\n%s - Installing Hyprland additional dependencies (glaze).... \n" "${NO
 if [ ! -d /usr/include/glaze ]; then
     echo "${INFO} ${YELLOW}Glaze${RESET} is not installed. Installing ${YELLOW}glaze from assets${RESET} ..."
     sudo dpkg -i assets/libglaze-dev_4.4.3-1_all.deb 2>&1 | tee -a "$LOG"
-    sudo apt-get install -f -y 2>&1 | tee -a "$LOG"
+    sudo apt install -f -y 2>&1 | tee -a "$LOG"
     echo "${INFO} ${YELLOW}libglaze-dev from assets${RESET} installed."
 fi
 

install-scripts/hyprlock.sh

@@ -8,7 +8,6 @@ lock=(
 	libdrm-dev
     libmagic-dev
     libaudit-dev
-    libsdbus-c++-dev
 )
 
 build_dep=(

install-scripts/hyprpolkitagent.sh

@@ -6,10 +6,6 @@
 polkitagent=(
 	libpolkit-agent-1-dev
 	libpolkit-qt6-1-dev
-  qml6-module-qtquick-layouts
-  qt6-tools-dev
-  qt6-tools-dev-tools
-  qt6-charts-dev
 )
 
 #specific branch or release
@@ -36,7 +32,7 @@ MLOG="install-$(date +%d-%H%M%S)_hyprpolkitagent.log"
 printf "\n%s - Installing hyprpolkitagent dependencies.... \n" "${NOTE}"
 
 for PKG1 in "${polkitagent[@]}"; do
-  re_install_package "$PKG1" 2>&1 | tee -a "$LOG"
+  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

install-scripts/xdph.sh

@@ -3,17 +3,10 @@
 # XDG-Desktop-Portals for hyprland #
 
 xdg=(
-  libdrm-dev
-  libpipewire-0.3-dev
-  libspa-0.2-dev
-  libsdbus-c++-dev
-  libwayland-client0
-  wayland-protocols
     xdg-desktop-portal-gtk
+    xdg-desktop-portal-hyprland
 )
 
-xdph_tag="v1.3.9"
-
 ## WARNING: DO NOT EDIT BEYOND THIS LINE IF YOU DON'T KNOW WHAT YOU ARE DOING! ##
 SCRIPT_DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
 
@@ -33,38 +26,9 @@ LOG="Install-Logs/install-$(date +%d-%H%M%S)_xdph.log"
 [[ -f "/usr/lib/xdg-desktop-portal-hyprland" ]] && sudo rm "/usr/lib/xdg-desktop-portal-hyprland"
 
 # XDG-DESKTOP-PORTAL-HYPRLAND
-printf "${NOTE} Installing ${SKY_BLUE}xdg-desktop-portal-hyprland dependencies${RESET}\n\n" 
+printf "${NOTE} Installing ${SKY_BLUE}xdg-desktop-portal-hyprland${RESET}\n\n" 
-
+for xdgs in "${xdg[@]}"; do
-for PKG1 in "${xdg[@]}"; do
+  install_package "$xdgs" "$LOG"
-  re_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
     
-# Clone, build, and install XDPH
-printf "${NOTE} Cloning and Installing ${YELLOW}XDG Desktop Portal Hyprland $hyprland_tag${RESET} ...\n"
-
-# Check if xdg-desktop-portal-hyprland folder exists and remove it
-if [ -d "xdg-desktop-portal-hyprland" ]; then
-  printf "${NOTE} Removing existing xdg-desktop-portal-hyprland folder...\n"
-  rm -rf "xdg-desktop-portal-hyprland" 2>&1 | tee -a "$LOG"
-fi
-
-if git clone --recursive -b $xdph_tag "https://github.com/hyprwm/xdg-desktop-portal-hyprland.git"; then
-  cd "xdg-desktop-portal-hyprland" || exit 1
-  cmake -DCMAKE_INSTALL_LIBEXECDIR=/usr/lib -DCMAKE_INSTALL_PREFIX=/usr -B build
-  cmake --build build
-  if sudo cmake --install build 2>&1 | tee -a "$MLOG"; then
-    printf "${OK} ${MAGENTA}xdph $xdph_tag${RESET}  installed successfully.\n" 2>&1 | tee -a "$MLOG"
-  else
-    echo -e "${ERROR} Installation failed for ${YELLOW}xdph $xdph_tag${RESET}" 2>&1 | tee -a "$MLOG"
-  fi
-  mv $MLOG ../Install-Logs/ || true   
-  cd ..
-else
-  echo -e "${ERROR} Download failed for ${YELLOW}xdph $xdph_tag${RESET}" 2>&1 | tee -a "$LOG"
-fi
-
 printf "\n%.0s" {1..2}

install.sh

@@ -329,12 +329,12 @@ echo "${INFO} Installing ${SKY_BLUE}KooL Hyprland packages...${RESET}" | tee -a
 sleep 1
 execute_script "01-hypr-pkgs.sh"
 sleep 1
-execute_script "hyprutils.sh"
-sleep 1
 execute_script "hyprlang.sh"
 sleep 1
 execute_script "hyprcursor.sh"
 sleep 1
+execute_script "hyprutils.sh"
+sleep 1
 execute_script "hyprwayland-scanner.sh"
 sleep 1
 execute_script "hyprgraphics.sh"
@@ -464,8 +464,8 @@ execute_script "03-Final-Check.sh"
 
 printf "\n%.0s" {1..1}
 
-# Check if either hyprland or Hyprland files exist in /usr/local/bin/
+# Check if either hyprland or hyprland-git is installed
-if [ -e /usr/local/bin/hyprland ] || [ -f /usr/local/bin/Hyprland ]; then
+if dpkg -l | grep -qw hyprland; then
     printf "\n ${OK} 👌 Hyprland is installed. However, some essential packages may not be installed. Please see above!"
     printf "\n${CAT} Ignore this message if it states ${YELLOW}All essential packages${RESET} are installed as per above\n"
     sleep 2