mirror of
https://github.com/JaKooLit/Debian-Hyprland.git
synced 2026-02-05 09:40:14 +01:00
Adding hyprwire depdency
On branch development Your branch is up to date with 'origin/development'. Changes to be committed: modified: hypr-tags.env new file: install-scripts/hyprwire.sh modified: install.sh modified: refresh-hypr-tags.sh modified: update-hyprland.sh
This commit is contained in:
Don Williams
parent
b1cca5a898
commit
2357e80e00
@ -12,4 +12,5 @@ HYPRWAYLAND_SCANNER_TAG=v0.4.5
|
||||
HYPRLAND_PROTOCOLS_TAG=v0.7.0
|
||||
HYPRLAND_QT_SUPPORT_TAG=v0.1.0
|
||||
HYPRLAND_GUIUTILS_TAG=v0.2.0
|
||||
HYPRWIRE_TAG=auto
|
||||
WAYLAND_PROTOCOLS_TAG=1.46
|
||||
|
||||
62
install-scripts/hyprwire.sh
Normal file
62
install-scripts/hyprwire.sh
Normal file
@ -0,0 +1,62 @@
|
||||
#!/bin/bash
|
||||
# 💫 https://github.com/JaKooLit 💫 #
|
||||
# Hypr Ecosystem
|
||||
# hyprwire
|
||||
|
||||
# Specific branch or release (honor env override)
|
||||
tag="v0.1.0"
|
||||
if [ -n "${HYPRWIRE_TAG:-}" ]; then tag="$HYPRWIRE_TAG"; fi
|
||||
|
||||
# Dry-run support
|
||||
DO_INSTALL=1
|
||||
if [ "$1" = "--dry-run" ] || [ "${DRY_RUN}" = "1" ] || [ "${DRY_RUN}" = "true" ]; then
|
||||
DO_INSTALL=0
|
||||
echo "${NOTE} DRY RUN: install step will be skipped."
|
||||
fi
|
||||
|
||||
## 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)_hyprwire.log"
|
||||
MLOG="install-$(date +%d-%H%M%S)_hyprwire2.log"
|
||||
|
||||
printf "${NOTE} Installing hyprwire $tag...\n"
|
||||
|
||||
# Remove existing tree if present
|
||||
if [ -d "hyprwire" ]; then
|
||||
printf "${NOTE} Removing existing hyprwire folder...\n"
|
||||
rm -rf "hyprwire" 2>&1 | tee -a "$LOG"
|
||||
fi
|
||||
|
||||
# Clone and build
|
||||
if git clone --recursive -b "$tag" https://github.com/hyprwm/hyprwire.git; then
|
||||
cd hyprwire || exit 1
|
||||
cmake -S . -B build -DCMAKE_BUILD_TYPE=Release -DCMAKE_INSTALL_PREFIX=/usr/local
|
||||
cmake --build build -j "$(nproc 2>/dev/null || getconf _NPROCESSORS_CONF)"
|
||||
if [ $DO_INSTALL -eq 1 ]; then
|
||||
if sudo cmake --install build 2>&1 | tee -a "$MLOG" ; then
|
||||
printf "${OK} hyprwire $tag installed successfully.\n" 2>&1 | tee -a "$MLOG"
|
||||
else
|
||||
echo -e "${ERROR} Installation failed for hyprwire $tag" 2>&1 | tee -a "$MLOG"
|
||||
fi
|
||||
else
|
||||
echo "${NOTE} DRY RUN: Skipping installation of hyprwire $tag."
|
||||
fi
|
||||
[ -f "$MLOG" ] && mv "$MLOG" ../Install-Logs/
|
||||
cd ..
|
||||
else
|
||||
echo -e "${ERROR} Download failed for hyprwire $tag" 2>&1 | tee -a "$LOG"
|
||||
fi
|
||||
|
||||
printf "\n%.0s" {1..2}
|
||||
@ -293,7 +293,7 @@ if [ -f "./hypr-tags.env" ]; then
|
||||
source "./hypr-tags.env"
|
||||
fi
|
||||
fi
|
||||
export HYPRLAND_TAG AQUAMARINE_TAG HYPRUTILS_TAG HYPRLANG_TAG HYPRGRAPHICS_TAG HYPRWAYLAND_SCANNER_TAG HYPRLAND_PROTOCOLS_TAG HYPRLAND_QT_SUPPORT_TAG HYPRLAND_QTUTILS_TAG WAYLAND_PROTOCOLS_TAG
|
||||
export HYPRLAND_TAG AQUAMARINE_TAG HYPRUTILS_TAG HYPRLANG_TAG HYPRGRAPHICS_TAG HYPRWAYLAND_SCANNER_TAG HYPRLAND_PROTOCOLS_TAG HYPRLAND_QT_SUPPORT_TAG HYPRLAND_QTUTILS_TAG HYPRWIRE_TAG WAYLAND_PROTOCOLS_TAG
|
||||
fi
|
||||
|
||||
#################
|
||||
@ -540,6 +540,9 @@ else
|
||||
sleep 1
|
||||
execute_script "xkbcommon.sh"
|
||||
sleep 1
|
||||
# Build hyprwire before Hyprland (required by Hyprland >= 0.53)
|
||||
execute_script "hyprwire.sh"
|
||||
sleep 1
|
||||
execute_script "hyprland.sh"
|
||||
sleep 1
|
||||
execute_script "hyprpolkitagent.sh"
|
||||
|
||||
4
refresh-hypr-tags.sh
Normal file → Executable file
4
refresh-hypr-tags.sh
Normal file → Executable file
@ -13,7 +13,7 @@ SUMMARY_LOG="$LOG_DIR/refresh-tags-$TS.log"
|
||||
|
||||
# Ensure tags file exists
|
||||
if [[ ! -f "$TAGS_FILE" ]]; then
|
||||
cat > "$TAGS_FILE" <<'EOF'
|
||||
cat > "$TAGS_FILE" <<'EOF'
|
||||
HYPRLAND_TAG=v0.51.1
|
||||
AQUAMARINE_TAG=v0.9.3
|
||||
HYPRUTILS_TAG=v0.8.2
|
||||
@ -23,6 +23,7 @@ HYPRWAYLAND_SCANNER_TAG=v0.4.5
|
||||
HYPRLAND_PROTOCOLS_TAG=v0.6.4
|
||||
HYPRLAND_QT_SUPPORT_TAG=v0.1.0
|
||||
HYPRLAND_QTUTILS_TAG=v0.1.4
|
||||
HYPRWIRE_TAG=auto
|
||||
WAYLAND_PROTOCOLS_TAG=1.45
|
||||
EOF
|
||||
fi
|
||||
@ -47,6 +48,7 @@ declare -A repos=(
|
||||
[HYPRLAND_PROTOCOLS_TAG]="hyprwm/hyprland-protocols"
|
||||
[HYPRLAND_QT_SUPPORT_TAG]="hyprwm/hyprland-qt-support"
|
||||
[HYPRLAND_QTUTILS_TAG]="hyprwm/hyprland-qtutils"
|
||||
[HYPRWIRE_TAG]="hyprwm/hyprwire"
|
||||
)
|
||||
|
||||
# Read existing
|
||||
|
||||
@ -44,6 +44,7 @@ DEFAULT_MODULES=(
|
||||
hyprland-protocols
|
||||
hyprland-qt-support
|
||||
hyprland-guiutils
|
||||
hyprwire
|
||||
hyprland
|
||||
)
|
||||
|
||||
@ -75,6 +76,7 @@ HYPRWAYLAND_SCANNER_TAG=v0.4.5
|
||||
HYPRLAND_PROTOCOLS_TAG=v0.6.4
|
||||
HYPRLAND_QT_SUPPORT_TAG=v0.1.0
|
||||
HYPRLAND_QTUTILS_TAG=v0.1.4
|
||||
HYPRWIRE_TAG=auto
|
||||
EOF
|
||||
fi
|
||||
}
|
||||
@ -156,6 +158,7 @@ fetch_latest_tags() {
|
||||
[HYPRLAND_PROTOCOLS_TAG]="hyprwm/hyprland-protocols"
|
||||
[HYPRLAND_QT_SUPPORT_TAG]="hyprwm/hyprland-qt-support"
|
||||
[HYPRLAND_QTUTILS_TAG]="hyprwm/hyprland-qtutils"
|
||||
[HYPRWIRE_TAG]="hyprwm/hyprwire"
|
||||
)
|
||||
|
||||
declare -A tags
|
||||
@ -209,7 +212,7 @@ run_stack() {
|
||||
# shellcheck disable=SC1090
|
||||
source "$TAGS_FILE"
|
||||
# Export tags so child scripts inherit them
|
||||
export HYPRLAND_TAG AQUAMARINE_TAG HYPRUTILS_TAG HYPRLANG_TAG HYPRGRAPHICS_TAG HYPRWAYLAND_SCANNER_TAG HYPRLAND_PROTOCOLS_TAG HYPRLAND_QT_SUPPORT_TAG HYPRLAND_QTUTILS_TAG WAYLAND_PROTOCOLS_TAG
|
||||
export HYPRLAND_TAG AQUAMARINE_TAG HYPRUTILS_TAG HYPRLANG_TAG HYPRGRAPHICS_TAG HYPRWAYLAND_SCANNER_TAG HYPRLAND_PROTOCOLS_TAG HYPRLAND_QT_SUPPORT_TAG HYPRLAND_QTUTILS_TAG HYPRWIRE_TAG WAYLAND_PROTOCOLS_TAG
|
||||
|
||||
# Optionally install dependencies (not dry-run)
|
||||
if [[ $WITH_DEPS -eq 1 ]]; then
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user