From 118d1509bbbe6807ee31dc5d62f8347b12095ec3 Mon Sep 17 00:00:00 2001 From: Don Williams Date: Mon, 29 Dec 2025 12:54:31 -0500 Subject: [PATCH] Scripts has hardcoded versions vs. pulling hypr-env On branch development Your branch is up to date with 'origin/development'. Changes to be committed: modified: install-scripts/aquamarine.sh modified: install-scripts/hyprcursor.sh modified: install-scripts/hyprgraphics.sh modified: install-scripts/hyprland-guiutils.sh modified: install-scripts/hyprland-protocols.sh modified: install-scripts/hyprland-qt-support.sh modified: install-scripts/hyprland.sh modified: install-scripts/hyprlang.sh modified: install-scripts/hyprtoolkit.sh modified: install-scripts/hyprutils.sh modified: install-scripts/hyprwayland-scanner.sh modified: install-scripts/hyprwire.sh modified: install-scripts/wayland-protocols-src.sh --- install-scripts/aquamarine.sh | 7 ++++++- install-scripts/hyprcursor.sh | 6 ++++++ install-scripts/hyprgraphics.sh | 5 +++++ install-scripts/hyprland-guiutils.sh | 5 +++++ install-scripts/hyprland-protocols.sh | 5 +++++ install-scripts/hyprland-qt-support.sh | 5 +++++ install-scripts/hyprland.sh | 5 +++++ install-scripts/hyprlang.sh | 5 +++++ install-scripts/hyprtoolkit.sh | 5 +++++ install-scripts/hyprutils.sh | 5 +++++ install-scripts/hyprwayland-scanner.sh | 5 +++++ install-scripts/hyprwire.sh | 5 +++++ install-scripts/wayland-protocols-src.sh | 5 +++++ 13 files changed, 67 insertions(+), 1 deletion(-) diff --git a/install-scripts/aquamarine.sh b/install-scripts/aquamarine.sh index 97a986d..60f0f4c 100755 --- a/install-scripts/aquamarine.sh +++ b/install-scripts/aquamarine.sh @@ -6,6 +6,11 @@ #specific branch or release tag="v0.10.0" +# Auto-source centralized tags if env is unset +if [ -z "${AQUAMARINE_TAG:-}" ]; then + TAGS_FILE="$(cd "$(dirname "${BASH_SOURCE[0]}")/.." && pwd)/hypr-tags.env" + [ -f "$TAGS_FILE" ] && source "$TAGS_FILE" +fi # Allow environment override if [ -n "${AQUAMARINE_TAG:-}" ]; then tag="$AQUAMARINE_TAG"; fi @@ -43,7 +48,7 @@ fi # Clone and build 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 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` diff --git a/install-scripts/hyprcursor.sh b/install-scripts/hyprcursor.sh index 7ed926f..f5f8b7a 100755 --- a/install-scripts/hyprcursor.sh +++ b/install-scripts/hyprcursor.sh @@ -10,6 +10,12 @@ librsvg2-dev #specific branch or release tag="v0.1.13" +# Auto-source centralized tags if env is unset; allow override via HYPRCURSOR_TAG if present +if [ -z "${HYPRCURSOR_TAG:-}" ]; then + TAGS_FILE="$(cd "$(dirname "${BASH_SOURCE[0]}")/.." && pwd)/hypr-tags.env" + [ -f "$TAGS_FILE" ] && source "$TAGS_FILE" +fi +if [ -n "${HYPRCURSOR_TAG:-}" ]; then tag="$HYPRCURSOR_TAG"; 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 )" diff --git a/install-scripts/hyprgraphics.sh b/install-scripts/hyprgraphics.sh index 21cb5f4..6dbf026 100755 --- a/install-scripts/hyprgraphics.sh +++ b/install-scripts/hyprgraphics.sh @@ -9,6 +9,11 @@ hyprgraphics=( #specific branch or release tag="v0.4.0" +# Auto-source centralized tags if env is unset +if [ -z "${HYPRGRAPHICS_TAG:-}" ]; then + TAGS_FILE="$(cd "$(dirname "${BASH_SOURCE[0]}")/.." && pwd)/hypr-tags.env" + [ -f "$TAGS_FILE" ] && source "$TAGS_FILE" +fi # Allow environment override if [ -n "${HYPRGRAPHICS_TAG:-}" ]; then tag="$HYPRGRAPHICS_TAG"; fi diff --git a/install-scripts/hyprland-guiutils.sh b/install-scripts/hyprland-guiutils.sh index badf48a..01dd9b3 100755 --- a/install-scripts/hyprland-guiutils.sh +++ b/install-scripts/hyprland-guiutils.sh @@ -18,6 +18,11 @@ guiutils=( #specific branch or release tag="v0.2.0" +# Auto-source centralized tags if env is unset +if [ -z "${HYPRLAND_GUIUTILS_TAG:-}" ]; then + TAGS_FILE="$(cd "$(dirname "${BASH_SOURCE[0]}")/.." && pwd)/hypr-tags.env" + [ -f "$TAGS_FILE" ] && source "$TAGS_FILE" +fi # Allow environment override if [ -n "${HYPRLAND_GUIUTILS_TAG:-}" ]; then tag="$HYPRLAND_GUIUTILS_TAG"; fi diff --git a/install-scripts/hyprland-protocols.sh b/install-scripts/hyprland-protocols.sh index ce05bbf..dbcbb4f 100755 --- a/install-scripts/hyprland-protocols.sh +++ b/install-scripts/hyprland-protocols.sh @@ -6,6 +6,11 @@ #specific branch or release tag="v0.7.0" +# Auto-source centralized tags if env is unset +if [ -z "${HYPRLAND_PROTOCOLS_TAG:-}" ]; then + TAGS_FILE="$(cd "$(dirname "${BASH_SOURCE[0]}")/.." && pwd)/hypr-tags.env" + [ -f "$TAGS_FILE" ] && source "$TAGS_FILE" +fi # Allow environment override if [ -n "${HYPRLAND_PROTOCOLS_TAG:-}" ]; then tag="$HYPRLAND_PROTOCOLS_TAG"; fi diff --git a/install-scripts/hyprland-qt-support.sh b/install-scripts/hyprland-qt-support.sh index b9fb83e..2018c66 100755 --- a/install-scripts/hyprland-qt-support.sh +++ b/install-scripts/hyprland-qt-support.sh @@ -16,6 +16,11 @@ qt_support=( #specific branch or release tag="v0.1.0" +# Auto-source centralized tags if env is unset +if [ -z "${HYPRLAND_QT_SUPPORT_TAG:-}" ]; then + TAGS_FILE="$(cd "$(dirname "${BASH_SOURCE[0]}")/.." && pwd)/hypr-tags.env" + [ -f "$TAGS_FILE" ] && source "$TAGS_FILE" +fi # Allow environment override if [ -n "${HYPRLAND_QT_SUPPORT_TAG:-}" ]; then tag="$HYPRLAND_QT_SUPPORT_TAG"; fi diff --git a/install-scripts/hyprland.sh b/install-scripts/hyprland.sh index 1b0f281..a734224 100755 --- a/install-scripts/hyprland.sh +++ b/install-scripts/hyprland.sh @@ -4,6 +4,11 @@ #specific branch or release tag="v0.53.0" +# Auto-source centralized tags if env is unset +if [ -z "${HYPRLAND_TAG:-}" ]; then + TAGS_FILE="$(cd "$(dirname "${BASH_SOURCE[0]}")/.." && pwd)/hypr-tags.env" + [ -f "$TAGS_FILE" ] && source "$TAGS_FILE" +fi # Allow environment override if [ -n "${HYPRLAND_TAG:-}" ]; then tag="$HYPRLAND_TAG"; fi diff --git a/install-scripts/hyprlang.sh b/install-scripts/hyprlang.sh index 95f3bfe..d5fc1f8 100755 --- a/install-scripts/hyprlang.sh +++ b/install-scripts/hyprlang.sh @@ -6,6 +6,11 @@ #specific branch or release tag="v0.6.7" +# Auto-source centralized tags if env is unset +if [ -z "${HYPRLANG_TAG:-}" ]; then + TAGS_FILE="$(cd "$(dirname "${BASH_SOURCE[0]}")/.." && pwd)/hypr-tags.env" + [ -f "$TAGS_FILE" ] && source "$TAGS_FILE" +fi # Allow environment override if [ -n "${HYPRLANG_TAG:-}" ]; then tag="$HYPRLANG_TAG"; fi diff --git a/install-scripts/hyprtoolkit.sh b/install-scripts/hyprtoolkit.sh index f059c01..7222123 100755 --- a/install-scripts/hyprtoolkit.sh +++ b/install-scripts/hyprtoolkit.sh @@ -5,6 +5,11 @@ #specific branch or release tag="v0.4.1" +# Auto-source centralized tags if env is unset +if [ -z "${HYPRTOOLKIT_TAG:-}" ]; then + TAGS_FILE="$(cd "$(dirname "${BASH_SOURCE[0]}")/.." && pwd)/hypr-tags.env" + [ -f "$TAGS_FILE" ] && source "$TAGS_FILE" +fi # Allow environment override if [ -n "${HYPRTOOLKIT_TAG:-}" ]; then tag="$HYPRTOOLKIT_TAG"; fi diff --git a/install-scripts/hyprutils.sh b/install-scripts/hyprutils.sh index 311a1d2..e96e216 100755 --- a/install-scripts/hyprutils.sh +++ b/install-scripts/hyprutils.sh @@ -5,6 +5,11 @@ #specific branch or release tag="v0.10.4" +# Auto-source centralized tags if env is unset +if [ -z "${HYPRUTILS_TAG:-}" ]; then + TAGS_FILE="$(cd "$(dirname "${BASH_SOURCE[0]}")/.." && pwd)/hypr-tags.env" + [ -f "$TAGS_FILE" ] && source "$TAGS_FILE" +fi # Allow environment override if [ -n "${HYPRUTILS_TAG:-}" ]; then tag="$HYPRUTILS_TAG"; fi diff --git a/install-scripts/hyprwayland-scanner.sh b/install-scripts/hyprwayland-scanner.sh index c95b1f1..a9dcc35 100755 --- a/install-scripts/hyprwayland-scanner.sh +++ b/install-scripts/hyprwayland-scanner.sh @@ -9,6 +9,11 @@ scan_depend=( #specific branch or release tag="v0.4.5" +# Auto-source centralized tags if env is unset +if [ -z "${HYPRWAYLAND_SCANNER_TAG:-}" ]; then + TAGS_FILE="$(cd "$(dirname "${BASH_SOURCE[0]}")/.." && pwd)/hypr-tags.env" + [ -f "$TAGS_FILE" ] && source "$TAGS_FILE" +fi # Allow environment override if [ -n "${HYPRWAYLAND_SCANNER_TAG:-}" ]; then tag="$HYPRWAYLAND_SCANNER_TAG"; fi diff --git a/install-scripts/hyprwire.sh b/install-scripts/hyprwire.sh index 63c1adc..4958688 100755 --- a/install-scripts/hyprwire.sh +++ b/install-scripts/hyprwire.sh @@ -5,6 +5,11 @@ # Specific branch or release (honor env override) tag="v0.1.0" +# Auto-source centralized tags if env is unset +if [ -z "${HYPRWIRE_TAG:-}" ]; then + TAGS_FILE="$(cd "$(dirname "${BASH_SOURCE[0]}")/.." && pwd)/hypr-tags.env" + [ -f "$TAGS_FILE" ] && source "$TAGS_FILE" +fi if [ -n "${HYPRWIRE_TAG:-}" ]; then tag="$HYPRWIRE_TAG"; fi # Dry-run support diff --git a/install-scripts/wayland-protocols-src.sh b/install-scripts/wayland-protocols-src.sh index f48f09d..51cbff2 100755 --- a/install-scripts/wayland-protocols-src.sh +++ b/install-scripts/wayland-protocols-src.sh @@ -5,6 +5,11 @@ #specific tag or release (e.g., 1.45, 1.46) tag="1.45" +# Auto-source centralized tags if env is unset +if [ -z "${WAYLAND_PROTOCOLS_TAG:-}" ]; then + TAGS_FILE="$(cd "$(dirname "${BASH_SOURCE[0]}")/.." && pwd)/hypr-tags.env" + [ -f "$TAGS_FILE" ] && source "$TAGS_FILE" +fi # Allow environment override if [ -n "${WAYLAND_PROTOCOLS_TAG:-}" ]; then tag="$WAYLAND_PROTOCOLS_TAG"; fi