mirror of
https://github.com/JaKooLit/Debian-Hyprland.git
synced 2025-12-21 10:20:12 +01:00
Pushing sdegler's changes to dev
On branch development Your branch is up to date with 'origin/development'. Changes to be committed: modified: install-scripts/aquamarine.sh new file: install-scripts/xkbcommon.sh
This commit is contained in:
parent
0ec2169efd
commit
42cbae3c1c
@ -45,7 +45,7 @@ fi
|
|||||||
printf "${INFO} Installing ${YELLOW}aquamarine $tag${RESET} ...\n"
|
printf "${INFO} Installing ${YELLOW}aquamarine $tag${RESET} ...\n"
|
||||||
if git clone --recursive -b $tag https://github.com/hyprwm/aquamarine.git; then
|
if git clone --recursive -b $tag https://github.com/hyprwm/aquamarine.git; then
|
||||||
cd aquamarine || exit 1
|
cd aquamarine || exit 1
|
||||||
cmake --no-warn-unused-cli -DCMAKE_BUILD_TYPE:STRING=Release -DCMAKE_INSTALL_PREFIX:PATH=/usr -S . -B ./build
|
cmake --no-warn-unused-cli -DCMAKE_BUILD_TYPE:STRING=Release -DCMAKE_INSTALL_PREFIX:PATH=/usr/local -S . -B ./build
|
||||||
cmake --build ./build --config Release --target all -j`nproc 2>/dev/null || getconf NPROCESSORS_CONF`
|
cmake --build ./build --config Release --target all -j`nproc 2>/dev/null || getconf NPROCESSORS_CONF`
|
||||||
if [ $DO_INSTALL -eq 1 ]; then
|
if [ $DO_INSTALL -eq 1 ]; then
|
||||||
if sudo cmake --install ./build 2>&1 | tee -a "$MLOG" ; then
|
if sudo cmake --install ./build 2>&1 | tee -a "$MLOG" ; then
|
||||||
|
|||||||
69
install-scripts/xkbcommon.sh
Executable file
69
install-scripts/xkbcommon.sh
Executable file
@ -0,0 +1,69 @@
|
|||||||
|
#!/bin/bash
|
||||||
|
# 💫 https://github.com/JaKooLit 💫 #
|
||||||
|
# Hypr Ecosystem #
|
||||||
|
# xkbcommon #
|
||||||
|
|
||||||
|
xkbcommon=(
|
||||||
|
bison
|
||||||
|
libzip-dev
|
||||||
|
librsvg2-dev
|
||||||
|
)
|
||||||
|
|
||||||
|
#specific branch or release
|
||||||
|
tag="xkbcommon-1.13.1"
|
||||||
|
|
||||||
|
## 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)_xkbcommon.log"
|
||||||
|
MLOG="install-$(date +%d-%H%M%S)_xkbcommon.log"
|
||||||
|
|
||||||
|
# Installation of dependencies
|
||||||
|
printf "\n%s - Installing xkbcommon dependencies.... \n" "${NOTE}"
|
||||||
|
|
||||||
|
for PKG1 in "${xkbcommon[@]}"; 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 xkbcommon folder exists and remove it
|
||||||
|
if [ -d "libxkbcommon" ]; then
|
||||||
|
printf "${NOTE} Removing existing libxkbcommon folder...\n"
|
||||||
|
rm -rf "libxkbcommon"
|
||||||
|
fi
|
||||||
|
|
||||||
|
# Clone and build
|
||||||
|
printf "${NOTE} Installing xkbcommon...\n"
|
||||||
|
if git clone --recursive -b $tag https://github.com/xkbcommon/libxkbcommon.git; then
|
||||||
|
cd libxkbcommon || exit 1
|
||||||
|
meson setup build --libdir=/usr/local/lib
|
||||||
|
meson compile -C build
|
||||||
|
if sudo meson install -C build 2>&1 | tee -a "$MLOG" ; then
|
||||||
|
printf "${OK} xkbcommon installed successfully.\n" 2>&1 | tee -a "$MLOG"
|
||||||
|
else
|
||||||
|
echo -e "${ERROR} Installation failed for xkbcommon." 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 xkbcommon." 2>&1 | tee -a "$LOG"
|
||||||
|
fi
|
||||||
|
|
||||||
|
printf "\n%.0s" {1..2}
|
||||||
|
|
||||||
|
|
||||||
Loading…
x
Reference in New Issue
Block a user