Set install from pkgs as default

Source builds need to HYPRLAND_FROM_SOURCE=1 set

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

 Changes to be committed:
	modified:   install-scripts/hyprland.sh
    modified:   install.sh
This commit is contained in:
Don Williams 2025-11-13 19:48:18 -05:00
parent f7c6e80d16
commit bb51fccf66
2 changed files with 26 additions and 4 deletions

View File

@ -15,6 +15,10 @@ if [ "$1" = "--dry-run" ] || [ "${DRY_RUN}" = "1" ] || [ "${DRY_RUN}" = "true" ]
echo "${NOTE} DRY RUN: install step will be skipped." echo "${NOTE} DRY RUN: install step will be skipped."
fi fi
# By default, install Hyprland from Debian packages.
# Set HYPRLAND_FROM_SOURCE=1 if you explicitly want to build from source.
HYPRLAND_FROM_SOURCE=${HYPRLAND_FROM_SOURCE:-0}
hyprland=( hyprland=(
clang clang
llvm llvm
@ -43,8 +47,25 @@ fi
LOG="Install-Logs/install-$(date +%d-%H%M%S)_hyprland.log" LOG="Install-Logs/install-$(date +%d-%H%M%S)_hyprland.log"
MLOG="install-$(date +%d-%H%M%S)_hyprland2.log" MLOG="install-$(date +%d-%H%M%S)_hyprland2.log"
# Installation of dependencies # If not explicitly told to build from source, install Hyprland from Debian packages
printf "\n%s - Installing hyprland additional dependencies.... \n" "${NOTE}" if [ "$HYPRLAND_FROM_SOURCE" != "1" ]; then
printf "\n%s - Installing ${YELLOW}Hyprland from Debian packages${RESET} .... \n" "${NOTE}"
if [ $DO_INSTALL -eq 1 ]; then
# Core Hyprland packages; pinning (if configured) will select sid/testing as needed
install_package "hyprland" 2>&1 | tee -a "$LOG"
install_package "hyprland-dev" 2>&1 | tee -a "$LOG" || true
install_package "hyprland-backgrounds" 2>&1 | tee -a "$LOG" || true
else
echo "${NOTE} DRY RUN: Would install hyprland, hyprland-dev and hyprland-backgrounds from APT."
fi
printf "\n%.0s" {1..2}
exit 0
fi
# Installation of dependencies for source builds
printf "\n%s - Installing hyprland additional dependencies (source build).... \n" "${NOTE}"
for PKG1 in "${hyprland[@]}"; do for PKG1 in "${hyprland[@]}"; do
install_package "$PKG1" 2>&1 | tee -a "$LOG" install_package "$PKG1" 2>&1 | tee -a "$LOG"

View File

@ -667,8 +667,9 @@ execute_script "03-Final-Check.sh"
printf "\n%.0s" {1..1} printf "\n%.0s" {1..1}
# Check if either hyprland or Hyprland files exist in /usr/local/bin/ # Check if Hyprland is available in PATH or in standard system locations
if [ -e /usr/local/bin/hyprland ] || [ -f /usr/local/bin/Hyprland ]; then if command -v Hyprland >/dev/null 2>&1 || command -v hyprland >/dev/null 2>&1 || \
[ -x /usr/bin/Hyprland ] || [ -x /usr/bin/hyprland ]; then
printf "\n ${OK} 👌 Hyprland is installed. However, some essential packages may not be installed. Please see above!" printf "\n ${OK} 👌 Hyprland is installed. However, some essential packages may not be installed. Please see above!"
printf "\n${CAT} Ignore this message if it states ${YELLOW}All essential packages${RESET} are installed as per above\n" printf "\n${CAT} Ignore this message if it states ${YELLOW}All essential packages${RESET} are installed as per above\n"
sleep 2 sleep 2