From c93c4984543dce9a6eadc0694a38a8147af3b547 Mon Sep 17 00:00:00 2001 From: JaKooLit Date: Wed, 12 Mar 2025 00:07:10 +0900 Subject: [PATCH] added manual building of hyprlang which ultimately fixes building of hypridle --- install-scripts/hypridle.sh | 1 - install-scripts/hyprlang.sh | 52 +++++++++++++++++++++++++++++++++++++ install.sh | 2 ++ 3 files changed, 54 insertions(+), 1 deletion(-) create mode 100755 install-scripts/hyprlang.sh diff --git a/install-scripts/hypridle.sh b/install-scripts/hypridle.sh index fb29b1c..fb2e41f 100755 --- a/install-scripts/hypridle.sh +++ b/install-scripts/hypridle.sh @@ -6,7 +6,6 @@ idle=( libsdbus-c++-dev libsdbus-c++2 libsdbus-c++-bin - libhyprlang-dev ) #specific branch or release diff --git a/install-scripts/hyprlang.sh b/install-scripts/hyprlang.sh new file mode 100755 index 0000000..ad8d0ef --- /dev/null +++ b/install-scripts/hyprlang.sh @@ -0,0 +1,52 @@ +#!/bin/bash +# 💫 https://github.com/JaKooLit 💫 # +# hyplang # + + +#specific branch or release +lang_tag="v0.5.2" + +## WARNING: DO NOT EDIT BEYOND THIS LINE IF YOU DON'T KNOW WHAT YOU ARE DOING! ## +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" || { echo "${ERROR} Failed to change directory to $PARENT_DIR"; exit 1; } + +# Source the global functions script +if ! source "$(dirname "$(readlink -f "$0")")/Global_functions.sh"; then + echo "Failed to source Global_functions.sh" + exit 1 +fi + +# 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)_hyprlang2.log" + +# Installation of dependencies +printf "\n%s - Installing ${YELLOW}hyprlang dependencies${RESET} .... \n" "${INFO}" + +# Check if hyprlang folder exists and remove it +if [ -d "hyprlang" ]; then + rm -rf "hyprlang" +fi + +# Clone and build +printf "${INFO} Installing ${YELLOW}hyprlang $lang_tag${RESET} ...\n" +if git clone --recursive -b $lang_tag https://github.com/hyprwm/hyprlang.git; then + cd hyprlang || 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 hyprlang -j`nproc 2>/dev/null || getconf _NPROCESSORS_CONF` + if sudo cmake --install ./build 2>&1 | tee -a "$MLOG" ; then + printf "${OK} ${MAGENTA}hyprlang $lang_tag${RESET} installed successfully.\n" 2>&1 | tee -a "$MLOG" + else + echo -e "${ERROR} Installation failed for ${YELLOW}hyprlang $lang_tag${RESET}" 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 ${YELLOW}hyprlang $lang_tag${RESET}" 2>&1 | tee -a "$LOG" +fi + +printf "\n%.0s" {1..2} \ No newline at end of file diff --git a/install.sh b/install.sh index 04d2663..8be497c 100755 --- a/install.sh +++ b/install.sh @@ -321,6 +321,8 @@ execute_script "rofi-wayland.sh" sleep 1 execute_script "hyprlock.sh" sleep 1 +execute_script "hyprlang.sh" +sleep 1 execute_script "hypridle.sh" #execute_script "imagemagick.sh" #this is for compiling from source. 07 Sep 2024