diff --git a/install-scripts/02-pre-cleanup.sh b/install-scripts/02-pre-cleanup.sh index 9864ac3..cd63a5d 100644 --- a/install-scripts/02-pre-cleanup.sh +++ b/install-scripts/02-pre-cleanup.sh @@ -9,10 +9,6 @@ TARGET_DIR="/usr/local/bin" # Define packages to manually remove (was manually installed previously) PACKAGES=( - hyprctl - hyprpm - hyprland - Hyprland cliphist pypr swappy @@ -20,6 +16,16 @@ PACKAGES=( magick ) +# List of packages installed from Debian-Hyprland repo +uninstall=( + xdg-desktop-portal-hyprland + libhhyprland-dev + libhyprutils-dev + libhyprutils0 + hyprwayland-scanner + hyprland-protocols +) + ## WARNING: DO NOT EDIT BEYOND THIS LINE IF YOU DON'T KNOW WHAT YOU ARE DOING! ## SCRIPT_DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )" @@ -51,4 +57,19 @@ for PKG_NAME in "${PACKAGES[@]}"; do fi done -clear \ No newline at end of file + +# packages removal installed from Debian-Hyprland repo +overall_failed=0 +printf "\n%s - ${SKY_BLUE}Removing some packages${RESET} installed from Debian Hyprland official repo \n" "${NOTE}" +for PKG in "${uninstall[@]}"; do + uninstall_package "$PKG" 2>&1 | tee -a "$LOG" + if [ $? -ne 0 ]; then + overall_failed=1 + fi +done + +if [ $overall_failed -ne 0 ]; then + echo -e "${ERROR} Some packages failed to uninstall. Please check the log." +fi + +printf "\n%.0s" {1..1} \ No newline at end of file diff --git a/install-scripts/hyprlock.sh b/install-scripts/hyprlock.sh index ecf9e86..1e037c9 100755 --- a/install-scripts/hyprlock.sh +++ b/install-scripts/hyprlock.sh @@ -10,6 +10,10 @@ lock=( libaudit-dev ) +build_dep=( + pam +) + #specific branch or release lock_tag="v0.9.0" @@ -37,6 +41,10 @@ for PKG1 in "${lock[@]}"; do re_install_package "$PKG1" "$LOG" done +for PKG1 in "${build_dep[@]}"; do + build_dep "$PKG1" "$LOG" +done + # Check if hyprlock directory exists and remove it if [ -d "hyprlock" ]; then rm -rf "hyprlock" diff --git a/install-scripts/rofi-wayland.sh b/install-scripts/rofi-wayland.sh index 25cce16..0526b40 100755 --- a/install-scripts/rofi-wayland.sh +++ b/install-scripts/rofi-wayland.sh @@ -35,7 +35,11 @@ rofi=( wget ) -rofi_tag="1.7.8+wayland1" +# variables +rofi_tag="1.7.9+wayland1" +release_url="https://github.com/lbonn/rofi/releases/download/1.7.9%2Bwayland1/rofi-1.7.9+wayland1.tar.gz" + + ## WARNING: DO NOT EDIT BEYOND THIS LINE IF YOU DON'T KNOW WHAT YOU ARE DOING! ## SCRIPT_DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )" @@ -62,7 +66,7 @@ printf "\n%s - Re-installing ${SKY_BLUE}rofi-wayland dependencies${RESET}.... \n printf "\n%.0s" {1..2} # Clone and build rofi - wayland -printf "${NOTE} Installing ${SKY_BLUE}rofi-wayland${RESET}...\n" +printf "${NOTE} Building and Installing ${SKY_BLUE}rofi-wayland${RESET} $rofi_tag ...\n" # Check if rofi directory exists if [ -d "rofi-$rofi_tag" ]; then @@ -71,7 +75,7 @@ fi # cloning rofi-wayland printf "${NOTE} Downloading ${YELLOW}rofi-wayland $rofi_tag${RESET} from releases...\n" -wget https://github.com/lbonn/rofi/releases/download/1.7.8%2Bwayland1/rofi-1.7.8+wayland1.tar.gz +wget $release_url if [ -f "rofi-$rofi_tag.tar.gz" ]; then printf "${OK} ${YELLOW}rofi-wayland $rofi_tag${RESET} downloaded successfully.\n" 2>&1 | tee -a "$LOG" diff --git a/install.sh b/install.sh index c36692f..048260c 100755 --- a/install.sh +++ b/install.sh @@ -20,9 +20,9 @@ SKY_BLUE="$(tput setaf 6)" RESET="$(tput sgr0)" # Display warning message -echo -e "${WARNING}NOTE:${RESET} Hyprland on Repo is extremely outdated and will not be supported anymore." -echo -e "Use this at your own risk." -echo -e "${WARNING}Any issues will not be dealt with${RESET}" +echo -e "${NOTE}: Most Hyprland Packages installed here are manually built from github" +echo -e "${INFO}: You need to manually update it yourself." +echo -e "${WARN}: Use this script at your own risk" echo # Prompt user to continue or exit @@ -78,7 +78,7 @@ fi printf "\n%.0s" {1..2} echo -e "\e[35m ╦╔═┌─┐┌─┐╦ ╦ ╦┬ ┬┌─┐┬─┐┬ ┌─┐┌┐┌┌┬┐ - ╠╩╗│ ││ │║ ╠═╣└┬┘├─┘├┬┘│ ├─┤│││ ││ 2025 + ╠╩╗│ ││ │║ ╠═╣└┬┘├─┘├┬┘│ ├─┤│││ ││ July 2025 ╩ ╩└─┘└─┘╩═╝ ╩ ╩ ┴ ┴ ┴└─┴─┘┴ ┴┘└┘─┴┘ Debian Trixie / SiD \e[0m" printf "\n%.0s" {1..1}