upd AQ to 0.9.3 built first

On branch hl-051
 Your branch is up to date with 'origin/hl-051'.

 Changes to be committed:
	modified:   dry-run-build.sh
	modified:   hypr-tags.env
	modified:   update-hyprland.sh
This commit is contained in:
Don Williams 2025-10-08 01:37:33 -04:00
parent 0593df837e
commit 5a34836119
3 changed files with 40 additions and 3 deletions

View File

@ -27,12 +27,12 @@ SUMMARY_LOG="$LOG_DIR/build-dry-run-$TS.log"
DEFAULT_MODULES=(
hyprutils
hyprlang
aquamarine
hyprgraphics
hyprwayland-scanner
hyprland-protocols
hyprland-qt-support
hyprland-qtutils
aquamarine
hyprland
)

View File

@ -3,7 +3,7 @@
# Each module script reads its TAG from these environment variables if set.
HYPRLAND_TAG=v0.51.1
AQUAMARINE_TAG=v0.9.2
AQUAMARINE_TAG=v0.9.3
HYPRUTILS_TAG=v0.8.2
HYPRLANG_TAG=v0.6.4
HYPRGRAPHICS_TAG=v0.1.5

View File

@ -35,12 +35,12 @@ SUMMARY_LOG="$LOG_DIR/update-hypr-$TS.log"
DEFAULT_MODULES=(
hyprutils
hyprlang
aquamarine
hyprgraphics
hyprwayland-scanner
hyprland-protocols
hyprland-qt-support
hyprland-qtutils
aquamarine
hyprland
)
@ -226,6 +226,43 @@ run_stack() {
modules=("${filtered[@]}")
fi
# Ensure aquamarine is installed before hyprland on install runs
if [[ $DO_INSTALL -eq 1 ]]; then
local has_hl=0 has_aqua=0
for m in "${modules[@]}"; do
[[ "$m" == "hyprland" ]] && has_hl=1
[[ "$m" == "aquamarine" ]] && has_aqua=1
done
if [[ $has_hl -eq 1 ]]; then
if [[ $has_aqua -eq 0 ]]; then
# Prepend aquamarine if missing
modules=("aquamarine" "${modules[@]}")
fi
# Reorder to ensure aquamarine appears before hyprland
# Remove existing occurrences and rebuild in correct order
local tmp=()
local inserted_aqua=0
for m in "${modules[@]}"; do
if [[ "$m" == "aquamarine" ]]; then
if [[ $inserted_aqua -eq 0 ]]; then
tmp+=("aquamarine")
inserted_aqua=1
fi
elif [[ "$m" == "hyprland" ]]; then
# ensure aquamarine is already present before adding hyprland
if [[ $inserted_aqua -eq 0 ]]; then
tmp+=("aquamarine")
inserted_aqua=1
fi
tmp+=("hyprland")
else
tmp+=("$m")
fi
done
modules=("${tmp[@]}")
fi
fi
declare -A results
for mod in "${modules[@]}"; do