diff --git a/README.md b/README.md index c087946..c7514de 100644 --- a/README.md +++ b/README.md @@ -271,6 +271,8 @@ env = WLR_RENDERER_ALLOW_SOFTWARE,1 ``` #### ❗ other known issues +- [ ] hypridle cant be installed + > [!NOTE] > Auto start of Hyprland after login (no SDDM or GDM or any login managers) - This was disabled a few days ago. (19 May 2024). This was because some users, after they used the Distro-Hyprland scripts with other DE (gnome-wayland or plasma-wayland), if they choose to login into gnome-wayland for example, Hyprland is starting. diff --git a/install-scripts/00-dependencies.sh b/install-scripts/00-dependencies.sh index dce8305..7242e18 100755 --- a/install-scripts/00-dependencies.sh +++ b/install-scripts/00-dependencies.sh @@ -24,6 +24,9 @@ dependencies=( libwayland-dev libcairo-5c-dev libcairo2-dev + libsdbus-c++-bin + libegl-dev + libegl1-mesa-dev libpango1.0-dev libgdk-pixbuf-2.0-dev libxcb-keysyms1-dev diff --git a/install-scripts/01-hypr-pkgs.sh b/install-scripts/01-hypr-pkgs.sh index ac092ff..ab43fc5 100755 --- a/install-scripts/01-hypr-pkgs.sh +++ b/install-scripts/01-hypr-pkgs.sh @@ -115,7 +115,7 @@ fi printf "\n%.0s" {1..2} # Install up-to-date Rust -echo "${INFO}Installing most ${YELLOW}up to date Rust compiler${RESET} ..." +echo "${INFO} Installing most ${YELLOW}up to date Rust compiler${RESET} ..." curl --proto '=https' --tlsv1.2 -sSf https://sh.rustup.rs | sh -s -- -y 2>&1 | tee -a "$LOG" source "$HOME/.cargo/env" diff --git a/install-scripts/02-pre-cleanup.sh b/install-scripts/02-pre-cleanup.sh index 0e57d49..4d3d473 100644 --- a/install-scripts/02-pre-cleanup.sh +++ b/install-scripts/02-pre-cleanup.sh @@ -43,8 +43,6 @@ for PKG_NAME in "${PACKAGES[@]}"; do # Delete the file sudo rm "$FILE_PATH" echo "Deleted: $FILE_PATH" 2>&1 | tee -a "$LOG" - else - echo "File not found: $FILE_PATH" 2>&1 | tee -a "$LOG" fi done diff --git a/install-scripts/hyprland.sh b/install-scripts/hyprland.sh index e3809d8..3d020ce 100755 --- a/install-scripts/hyprland.sh +++ b/install-scripts/hyprland.sh @@ -35,7 +35,7 @@ printf "${NOTE} Installing ${SKY_BLUE}Hyprland packages${RESET} .......\n" done # force -printf "${NOTE} Force Installing ${SKY_BLUE}Hyprland packages${RESET} .......\n" +printf "${NOTE} Reinstalling ${SKY_BLUE}Hyprland packages${RESET} .......\n" for HYPR1 in "${f_hypr[@]}"; do re_install_package "$HYPR1" "$LOG" done diff --git a/install-scripts/hyprlock.sh b/install-scripts/hyprlock.sh index c6d4808..8596c9a 100755 --- a/install-scripts/hyprlock.sh +++ b/install-scripts/hyprlock.sh @@ -41,21 +41,21 @@ if [ -d "hyprlock" ]; then fi # Clone and build hyprlock -printf "${INFO} Installing ${YELLOW}hypridle $lock_tag${RESET} ...\n" +printf "${INFO} Installing ${YELLOW}hyprlock $lock_tag${RESET} ...\n" if git clone --recursive -b $lock_tag https://github.com/hyprwm/hyprlock.git; then cd hyprlock || exit 1 cmake --no-warn-unused-cli -DCMAKE_BUILD_TYPE:STRING=Release -S . -B ./build cmake --build ./build --config Release --target hyprlock -j`nproc 2>/dev/null || getconf _NPROCESSORS_CONF` if sudo cmake --install build 2>&1 | tee -a "$MLOG" ; then - printf "${OK} ${MAGENTA}hypridle $lock_tag${RESET} installed successfully.\n" 2>&1 | tee -a "$MLOG" + printf "${OK} ${YELLOW}hyprlock $lock_tag${RESET} installed successfully.\n" 2>&1 | tee -a "$MLOG" else - echo -e "${ERROR} Installation failed for ${YELLOW}hypridle $lock_tag${RESET}" 2>&1 | tee -a "$MLOG" + echo -e "${ERROR} Installation failed for ${YELLOW}hyprlock $lock_tag${RESET}" 2>&1 | tee -a "$MLOG" fi #moving the addional logs to Install-Logs directory mv $MLOG ../Install-Logs/ || true cd .. else - echo -e "${ERROR} Download failed for ${YELLOW}hypridle $lock_tag${RESET}" 2>&1 | tee -a "$LOG" + echo -e "${ERROR} Download failed for ${YELLOW}hyprlock $lock_tag${RESET}" 2>&1 | tee -a "$LOG" fi printf "\n%.0s" {1..2} diff --git a/install-scripts/swww.sh b/install-scripts/swww.sh index 694ed03..75e5517 100755 --- a/install-scripts/swww.sh +++ b/install-scripts/swww.sh @@ -2,6 +2,18 @@ # 💫 https://github.com/JaKooLit 💫 # # SWWW - Wallpaper Utility # +# Check if 'swww' is installed +if command -v swww &>/dev/null; then + SWWW_VERSION=$(swww -V | awk '{print $NF}') + if [[ "$SWWW_VERSION" == "0.9.5" ]]; then + echo -e "${OK} ${MAGENTA}swww v0.9.5${RESET} is already installed. Skipping installation." + exit 0 + fi +else + echo -e "${ERROR} ${MAGENTA}swww${RESET} is not installed. Proceeding with installation." +fi + + swww=( liblz4-dev ) diff --git a/install-scripts/wallust.sh b/install-scripts/wallust.sh index f41fe2c..a73df13 100755 --- a/install-scripts/wallust.sh +++ b/install-scripts/wallust.sh @@ -19,7 +19,7 @@ LOG="Install-Logs/install-$(date +%d-%H%M%S)_wallust.log" mkdir -p "$(dirname "$LOG")" # Install up-to-date Rust -echo "${INFO}Installing most ${YELLOW}up to date Rust compiler${RESET} ..." +echo "${INFO} Installing most ${YELLOW}up to date Rust compiler${RESET} ..." curl --proto '=https' --tlsv1.2 -sSf https://sh.rustup.rs | sh -s -- -y 2>&1 | tee -a "$LOG" source "$HOME/.cargo/env" @@ -34,7 +34,7 @@ fi printf "\n%.0s" {1..2} # Install Wallust using Cargo -echo "${INFO}Installing ${SKY_BLUE}Wallust using Cargo${RESET} ..." | tee -a "$LOG" +echo "${INFO} Installing ${SKY_BLUE}Wallust using Cargo${RESET} ..." | tee -a "$LOG" if cargo install wallust 2>&1 | tee -a "$LOG" ; then echo "${OK} ${MAGENTA}Wallust${RESET} installed successfully." | tee -a "$LOG"