From 544ea59ae25097b4507e25d243bc6eaa7cc9ced5 Mon Sep 17 00:00:00 2001 From: JaKooLit Date: Sun, 5 May 2024 06:41:19 +0900 Subject: [PATCH] updated for Hyprland-v0.40.0 and waybar building from source to fix workspace missing --- install-scripts/hyprland.sh | 2 +- install-scripts/hyprlock.sh | 2 +- install-scripts/hyprwayland-scanner.sh | 65 ++++++++++++++++++++ install-scripts/waybar-git.sh | 82 ++++++++++++++++++++++++++ install.sh | 2 + 5 files changed, 151 insertions(+), 2 deletions(-) create mode 100755 install-scripts/hyprwayland-scanner.sh create mode 100755 install-scripts/waybar-git.sh diff --git a/install-scripts/hyprland.sh b/install-scripts/hyprland.sh index 768b657..3abc0cd 100755 --- a/install-scripts/hyprland.sh +++ b/install-scripts/hyprland.sh @@ -4,7 +4,7 @@ #specific branch or release -hyprland_tag="v0.39.1" +hyprland_tag="v0.40.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 diff --git a/install-scripts/hyprlock.sh b/install-scripts/hyprlock.sh index 9c84d6d..a42c912 100755 --- a/install-scripts/hyprlock.sh +++ b/install-scripts/hyprlock.sh @@ -34,7 +34,7 @@ for PKG1 in "${lock[@]}"; do fi done -# Check if hyprlidle folder exists and remove it +# Check if hyprlock folder exists and remove it if [ -d "hyprlock" ]; then printf "${NOTE} Removing existing hyprlock folder...\n" rm -rf "hyprlock" diff --git a/install-scripts/hyprwayland-scanner.sh b/install-scripts/hyprwayland-scanner.sh new file mode 100755 index 0000000..03ef59d --- /dev/null +++ b/install-scripts/hyprwayland-scanner.sh @@ -0,0 +1,65 @@ +#!/bin/bash +# 💫 https://github.com/JaKooLit 💫 # +# hyprwayland-scanner - One depency from Hyprland v0.40.0# + +scan_depend=( +libpugixml-dev +) +#specific branch or release +scan_tag="v0.3.4" + +## 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)_hyprlang.log" +MLOG="install-$(date +%d-%H%M%S)_hyprwayland-scanner.log" + +## +# Installation of dependencies +printf "\n%s - Installing hyprwayland-scanner dependencies.... \n" "${NOTE}" + +for PKG1 in "${scan_depend[@]}"; 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 hyprwayland-scanner...\n" + +# Check if hyprwayland-scanner folder exists and remove it +if [ -d "hyprwayland-scanner" ]; then + printf "${NOTE} Removing existing hyprwayland-scanner folder...\n" + rm -rf "hyprwayland-scanner" +fi + +# Clone and build hyprlang +printf "${NOTE} Installing hyprwayland-scanner...\n" +if git clone --recursive -b $scan_tag https://github.com/hyprwm/hyprwayland-scanner.git; then + cd hyprwayland-scanner || exit 1 + cmake -DCMAKE_INSTALL_PREFIX=/usr -B build + cmake --build build -j `nproc` + if sudo cmake --install build 2>&1 | tee -a "$MLOG" ; then + printf "${OK} hyprwayland-scanner installed successfully.\n" 2>&1 | tee -a "$MLOG" + else + echo -e "${ERROR} Installation failed for hyprwayland-scanner." 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 hyprwayland-scanner. Please check log." 2>&1 | tee -a "$LOG" +fi + + +clear + diff --git a/install-scripts/waybar-git.sh b/install-scripts/waybar-git.sh new file mode 100755 index 0000000..c12b5c5 --- /dev/null +++ b/install-scripts/waybar-git.sh @@ -0,0 +1,82 @@ +#!/bin/bash +# 💫 https://github.com/JaKooLit 💫 # +# waybar - from source # + +waybar=( +cmake +meson +scdoc +wayland-protocols +clang-tidy +gobject-introspection +libdbusmenu-gtk3-dev +libevdev-dev +libfmt-dev +libgirepository1.0-dev +libgtk-3-dev +libgtkmm-3.0-dev +libinput-dev +libjsoncpp-dev +libmpdclient-dev +libnl-3-dev +libnl-genl-3-dev +libpulse-dev +libsigc++-2.0-dev +libspdlog-dev +libwayland-dev +scdoc +upower +libxkbregistry-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 +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)_waybar-gt.log" +MLOG="install-$(date +%d-%H%M%S)_waybar-git.log" + +# Installation of dependencies +printf "\n%s - Installing waybar-git dependencies.... \n" "${NOTE}" + +for PKG1 in "${waybar[@]}"; 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 + +# Check if waybar folder exists and remove it +if [ -d "waybar" ]; then + printf "${NOTE} Removing existing waybar folder...\n" + rm -rf "waybar" +fi + +# Clone and build waybar from source +printf "${NOTE} Installing waybar...\n" +if git clone https://github.com/Alexays/Waybar; then + cd Waybar || exit 1 + meson build + if sudo ninja -C build install 2>&1 | tee -a "$MLOG" ; then + printf "${OK} waybar-git installed successfully.\n" 2>&1 | tee -a "$MLOG" + else + echo -e "${ERROR} Installation failed for waybar-git." 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 waybar-git" 2>&1 | tee -a "$LOG" +fi + +clear + diff --git a/install.sh b/install.sh index dc8adc0..2334f17 100755 --- a/install.sh +++ b/install.sh @@ -167,8 +167,10 @@ execute_script "hyprlang.sh" execute_script "hyprlock.sh" execute_script "hyprcursor.sh" execute_script "hypridle.sh" +execute_script "hyprwayland-scanner.sh" execute_script "hyprland.sh" execute_script "hypr-eco.sh" +execute_script "waybar-git.sh" #execute_script "cliphist.sh"