diff --git a/CHANGELOGS.md b/CHANGELOGS.md index df6a434..94101ac 100644 --- a/CHANGELOGS.md +++ b/CHANGELOGS.md @@ -1,5 +1,9 @@ ## Changelogs + +## 06 July 2024 +- Version bumps for Debian (Hyprland v0.41.2) + ## 11 June 2024 - adjusted script to install only Hyprland-Dots v2.2.14 diff --git a/install-scripts/dotfiles.sh b/install-scripts/dotfiles.sh index e471084..f558c37 100755 --- a/install-scripts/dotfiles.sh +++ b/install-scripts/dotfiles.sh @@ -3,7 +3,7 @@ # Hyprland-Dots to download a specific release # # Define the specific release version to download -specific_version="v2.2.14" +specific_version="v2.3" ## WARNING: DO NOT EDIT BEYOND THIS LINE IF YOU DON'T KNOW WHAT YOU ARE DOING! ## diff --git a/install-scripts/hyprcursor.sh b/install-scripts/hyprcursor.sh index eb88508..e9423be 100755 --- a/install-scripts/hyprcursor.sh +++ b/install-scripts/hyprcursor.sh @@ -8,7 +8,7 @@ librsvg2-dev ) #specific branch or release -cursor_tag="v0.1.8" +cursor_tag="v0.1.9" ## WARNING: DO NOT EDIT BEYOND THIS LINE IF YOU DON'T KNOW WHAT YOU ARE DOING! ## # Determine the directory where the script is located @@ -45,8 +45,8 @@ fi printf "${NOTE} Installing hyprcursor...\n" if git clone --recursive -b $cursor_tag https://github.com/hyprwm/hyprcursor.git; then cd hyprcursor || exit 1 - cmake --no-warn-unused-cli -DCMAKE_BUILD_TYPE:STRING=Release -DCMAKE_INSTALL_PREFIX:PATH=/usr -S . -B ./build - cmake --build ./build --config Release --target all -j`nproc 2>/dev/null || getconf NPROCESSORS_CONF` + cmake --no-warn-unused-cli -DCMAKE_BUILD_TYPE:STRING=Release -DCMAKE_INSTALL_PREFIX:PATH=/usr -S . -B ./build + cmake --build ./build --config Release --target all -j`nproc 2>/dev/null || getconf NPROCESSORS_CONF` if sudo cmake --install ./build 2>&1 | tee -a "$MLOG" ; then printf "${OK} hyprcursor installed successfully.\n" 2>&1 | tee -a "$MLOG" else diff --git a/install-scripts/hyprland.sh b/install-scripts/hyprland.sh index 768b657..351773f 100755 --- a/install-scripts/hyprland.sh +++ b/install-scripts/hyprland.sh @@ -2,9 +2,12 @@ # 💫 https://github.com/JaKooLit 💫 # # Main Hyprland Package# - #specific branch or release -hyprland_tag="v0.39.1" +hyprland_tag="v0.41.2" + +hyprland=( + libxcb-errors-dev +) ## WARNING: DO NOT EDIT BEYOND THIS LINE IF YOU DON'T KNOW WHAT YOU ARE DOING! ## # Determine the directory where the script is located @@ -20,6 +23,17 @@ source "$(dirname "$(readlink -f "$0")")/Global_functions.sh" LOG="Install-Logs/install-$(date +%d-%H%M%S)_hyprland.log" MLOG="install-$(date +%d-%H%M%S)_hyprland2.log" +# Installation of dependencies +printf "\n%s - Installing hyprland additional dependencies.... \n" "${NOTE}" + +for PKG1 in "${hyprland[@]}"; 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 + # Clone, build, and install Hyprland using Cmake printf "${NOTE} Cloning Hyprland...\n" @@ -29,7 +43,7 @@ if [ -d "Hyprland" ]; then rm -rf "Hyprland" 2>&1 | tee -a "$LOG" fi -if git clone --recursive -b $hyprland_tag "https://github.com/hyprwm/Hyprland"; then +if git clone --recursive "https://github.com/hyprwm/Hyprland"; then cd "Hyprland" || exit 1 make all if sudo make install 2>&1 | tee -a "$MLOG"; then diff --git a/install-scripts/hyprlang.sh b/install-scripts/hyprlang.sh index 95a19ee..ef26dc9 100755 --- a/install-scripts/hyprlang.sh +++ b/install-scripts/hyprlang.sh @@ -3,7 +3,7 @@ # hyprlang - hyprland and xdg-desktop-portal- dependencies # #specific branch or release -lang_tag="v0.5.1" +lang_tag="v0.5.2" ## WARNING: DO NOT EDIT BEYOND THIS LINE IF YOU DON'T KNOW WHAT YOU ARE DOING! ## # Determine the directory where the script is located diff --git a/install-scripts/hyprlock.sh b/install-scripts/hyprlock.sh index 3d50769..e369103 100755 --- a/install-scripts/hyprlock.sh +++ b/install-scripts/hyprlock.sh @@ -7,7 +7,7 @@ libmagic-dev ) #specific branch or release -lock_tag="v0.3.0" +lock_tag="v0.4.0" ## WARNING: DO NOT EDIT BEYOND THIS LINE IF YOU DON'T KNOW WHAT YOU ARE DOING! ## # Determine the directory where the script is located @@ -58,5 +58,5 @@ else echo -e "${ERROR} Download failed for hyprlock." 2>&1 | tee -a "$LOG" fi -clear + diff --git a/install-scripts/hyprutils.sh b/install-scripts/hyprutils.sh new file mode 100755 index 0000000..d0871e6 --- /dev/null +++ b/install-scripts/hyprutils.sh @@ -0,0 +1,48 @@ +#!/bin/bash +# 💫 https://github.com/JaKooLit 💫 # +# Hypr Ecosystem # +# hyprutils # + +#specific branch or release +hyprutils_tag="v0.1.5" + +## 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)_hyprutils.log" +MLOG="install-$(date +%d-%H%M%S)_hyprutils2.log" + +# Clone, build, and install using Cmake +printf "${NOTE} Cloning hyprutils...\n" + +# Check if hyprutils folder exists and remove it +if [ -d "hyprutils" ]; then + printf "${NOTE} Removing existing hyprutils folder...\n" + rm -rf "hyprutils" 2>&1 | tee -a "$LOG" +fi + +if git clone -b $hyprutils_tag "https://github.com/hyprwm/hyprutils.git"; then + cd "hyprutils" || exit 1 + cmake --no-warn-unused-cli -DCMAKE_BUILD_TYPE:STRING=Release -DCMAKE_INSTALL_PREFIX:PATH=/usr -S . -B ./build + cmake --build ./build --config Release --target all -j`nproc 2>/dev/null || getconf _NPROCESSORS_CONF` + if sudo cmake --install build 2>&1 | tee -a "$MLOG"; then + printf "${OK} hyprutils installed successfully.\n" 2>&1 | tee -a "$MLOG" + else + echo -e "${ERROR} Installation failed for hyprutils." 2>&1 | tee -a "$MLOG" + fi + mv $MLOG ../Install-Logs/ || true + cd .. +else + echo -e "${ERROR} Download failed for hyprutils" 2>&1 | tee -a "$LOG" +fi + + + diff --git a/install-scripts/hyprwayland-scanner.sh b/install-scripts/hyprwayland-scanner.sh index 633e2af..aed0673 100755 --- a/install-scripts/hyprwayland-scanner.sh +++ b/install-scripts/hyprwayland-scanner.sh @@ -3,10 +3,10 @@ # hyprwayland-scanner - One depency from Hyprland v0.40.0# scan_depend=( -libpugixml-dev + libpugixml-dev ) #specific branch or release -scan_tag="v0.3.10" +scan_tag="v0.4.0" ## WARNING: DO NOT EDIT BEYOND THIS LINE IF YOU DON'T KNOW WHAT YOU ARE DOING! ## # Determine the directory where the script is located @@ -19,8 +19,8 @@ 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)_hyprlang.log" -MLOG="install-$(date +%d-%H%M%S)_hyprwayland-scanner.log" +LOG="Install-Logs/install-$(date +%d-%H%M%S)_hyprwayland-scanner.log" +MLOG="install-$(date +%d-%H%M%S)_hyprwayland-scanner2.log" ## # Installation of dependencies @@ -60,6 +60,5 @@ else echo -e "${ERROR} Download failed for hyprwayland-scanner. Please check log." 2>&1 | tee -a "$LOG" fi - clear diff --git a/install-scripts/xdph.sh b/install-scripts/xdph.sh index 54ae298..b87422d 100755 --- a/install-scripts/xdph.sh +++ b/install-scripts/xdph.sh @@ -1,11 +1,14 @@ #!/bin/bash # 💫 https://github.com/JaKooLit 💫 # -# XDG-Desktop-Portals # +# XDG-Desktop-Portals for hyprland # xdg=( -xdg-desktop-portal-gtk + xdg-desktop-portal-gtk ) +#specific branch or release +xdph_tag="v1.3.2" + ## 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 )" @@ -35,10 +38,11 @@ fi # Clone and build xdg-desktop-portal-hyprland printf "${NOTE} Installing xdg-desktop-portal-hyprland...\n" -if git clone --branch v1.3.0 --recursive https://github.com/hyprwm/xdg-desktop-portal-hyprland; then +if git clone -b $xdph_tag --recursive https://github.com/hyprwm/xdg-desktop-portal-hyprland; then cd xdg-desktop-portal-hyprland || exit 1 - make all - if sudo make install 2>&1 | tee -a "$MLOG" ; then + 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} xdg-desktop-portal-hyprland installed successfully.\n" 2>&1 | tee -a "$MLOG" else echo -e "${ERROR} Installation failed for xdg-desktop-portal-hyprland." 2>&1 | tee -a "$MLOG" diff --git a/install.sh b/install.sh index 5444494..258ebb0 100755 --- a/install.sh +++ b/install.sh @@ -169,6 +169,7 @@ execute_script "hyprlock.sh" execute_script "hyprcursor.sh" execute_script "hypridle.sh" execute_script "hyprwayland-scanner.sh" +execute_script "hyprutils.sh" execute_script "hyprland.sh" execute_script "hypr-eco.sh" # execute_script "waybar-git.sh" only if waybar on repo is old