From 7737b07f927c315267e7eea0ec97aa2fd54aaeba Mon Sep 17 00:00:00 2001 From: installer Date: Sat, 7 Sep 2024 21:53:03 +0900 Subject: [PATCH 1/4] Fix installation issue on hyprlock and xdph --- CHANGELOGS.md | 3 +++ install-scripts/hyprlock.sh | 3 +++ install-scripts/wallust.sh | 2 +- install-scripts/xdph.sh | 2 ++ 4 files changed, 9 insertions(+), 1 deletion(-) diff --git a/CHANGELOGS.md b/CHANGELOGS.md index 43d3279..350975d 100644 --- a/CHANGELOGS.md +++ b/CHANGELOGS.md @@ -1,5 +1,8 @@ ## Changelogs +## 07 Sep 2024 +- Fix installation issue on hyprlock and xdph + ## 04 Sep 2024 - added a function to check if it is Ubuntu or Based on Ubuntu and script will exit diff --git a/install-scripts/hyprlock.sh b/install-scripts/hyprlock.sh index 09cc9f7..cea2a61 100755 --- a/install-scripts/hyprlock.sh +++ b/install-scripts/hyprlock.sh @@ -3,6 +3,9 @@ # hyprlock # lock=( + libpam0g-dev + libgbm-dev + libdrm-dev libmagic-dev libhyprlang-dev libhyprutils-dev diff --git a/install-scripts/wallust.sh b/install-scripts/wallust.sh index a53e1e8..873053b 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 "Installing most up to Rust compiler..." +echo "Installing most up to date Rust compiler..." 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/xdph.sh b/install-scripts/xdph.sh index af5d605..78eed0e 100755 --- a/install-scripts/xdph.sh +++ b/install-scripts/xdph.sh @@ -3,6 +3,8 @@ # XDG-Desktop-Portals for hyprland # xdg=( + libpipewire-0.3-dev + libspa-0.2-dev xdg-desktop-portal-gtk ) From 2f8f619b96c7e70b66ae53fd578447d4095564f0 Mon Sep 17 00:00:00 2001 From: JaKooLit Date: Sat, 7 Sep 2024 22:45:55 +0900 Subject: [PATCH 2/4] disabled imagemagick compilation from source & dotfiles adjusted so it will be compatible for imagemagick v6 --- CHANGELOGS.md | 2 ++ install-scripts/00-hypr-pkgs.sh | 1 + install-scripts/01-pre-cleanup.sh | 1 + install-scripts/dotfiles.sh | 2 +- install.sh | 4 +++- 5 files changed, 8 insertions(+), 2 deletions(-) diff --git a/CHANGELOGS.md b/CHANGELOGS.md index 350975d..e761d73 100644 --- a/CHANGELOGS.md +++ b/CHANGELOGS.md @@ -2,6 +2,8 @@ ## 07 Sep 2024 - Fix installation issue on hyprlock and xdph +- disabled imagemagick compilation from source +- dotfiles adjusted so it will be compatible for imagemagick v6 ## 04 Sep 2024 - added a function to check if it is Ubuntu or Based on Ubuntu and script will exit diff --git a/install-scripts/00-hypr-pkgs.sh b/install-scripts/00-hypr-pkgs.sh index e9e5e2e..4b10740 100755 --- a/install-scripts/00-hypr-pkgs.sh +++ b/install-scripts/00-hypr-pkgs.sh @@ -17,6 +17,7 @@ hypr_package=( gvfs gvfs-backends inxi + imagemagick kitty nano pavucontrol diff --git a/install-scripts/01-pre-cleanup.sh b/install-scripts/01-pre-cleanup.sh index 913566f..c876574 100644 --- a/install-scripts/01-pre-cleanup.sh +++ b/install-scripts/01-pre-cleanup.sh @@ -17,6 +17,7 @@ PACKAGES=( pypr swappy waybar + magick ) ## WARNING: DO NOT EDIT BEYOND THIS LINE IF YOU DON'T KNOW WHAT YOU ARE DOING! ## diff --git a/install-scripts/dotfiles.sh b/install-scripts/dotfiles.sh index d518580..7c73e49 100755 --- a/install-scripts/dotfiles.sh +++ b/install-scripts/dotfiles.sh @@ -3,7 +3,7 @@ # Hyprland-Dots to download a specific release # # Define the specific release version to download -specific_version="v2.3.3-Deb-Untu" +specific_version="v2.3.3-Deb-Untu-Hyprland-0.41.2" ## WARNING: DO NOT EDIT BEYOND THIS LINE IF YOU DON'T KNOW WHAT YOU ARE DOING! ## diff --git a/install.sh b/install.sh index 2d45411..6aa075d 100755 --- a/install.sh +++ b/install.sh @@ -182,7 +182,9 @@ execute_script "00-dependencies.sh" execute_script "00-hypr-pkgs.sh" execute_script "fonts.sh" execute_script "wallust.sh" -execute_script "imagemagick.sh" + +#execute_script "imagemagick.sh" #this is for compiling from source. 07 Sep 2024 + execute_script "swww.sh" execute_script "rofi-wayland.sh" execute_script "ags.sh" From 17a68680388f0f16ff68142c2e76d1790d1ffe08 Mon Sep 17 00:00:00 2001 From: JaKooLit Date: Sat, 7 Sep 2024 23:07:59 +0900 Subject: [PATCH 3/4] added imagemagick on rofi-wayland since it has history of imagemagick not installing before --- install-scripts/rofi-wayland.sh | 1 + 1 file changed, 1 insertion(+) diff --git a/install-scripts/rofi-wayland.sh b/install-scripts/rofi-wayland.sh index dc018c3..68fc2c2 100755 --- a/install-scripts/rofi-wayland.sh +++ b/install-scripts/rofi-wayland.sh @@ -22,6 +22,7 @@ rofi=( libxcb-xinerama0-dev libxkbcommon-dev libxkbcommon-x11-dev + imagemagick ) From d900fe41749b395a299bb8021c5e1d473c5ebc24 Mon Sep 17 00:00:00 2001 From: JaKooLit Date: Sun, 8 Sep 2024 11:39:42 +0900 Subject: [PATCH 4/4] Added final error checks on install-logs --- CHANGELOGS.md | 3 +++ install.sh | 40 ++++++++++++++++++++++++++++++++++++++-- 2 files changed, 41 insertions(+), 2 deletions(-) diff --git a/CHANGELOGS.md b/CHANGELOGS.md index e761d73..87a85a9 100644 --- a/CHANGELOGS.md +++ b/CHANGELOGS.md @@ -1,5 +1,8 @@ ## Changelogs +## 08 Sep 2024 +- Added final error checks on install-logs + ## 07 Sep 2024 - Fix installation issue on hyprlock and xdph - disabled imagemagick compilation from source diff --git a/install.sh b/install.sh index 6aa075d..554c65e 100755 --- a/install.sh +++ b/install.sh @@ -246,9 +246,45 @@ fi clear +printf "\n%.0s" {1..3} + +# Error-checking section +LOG_DIR="Install-Logs" +ERROR_FILE="$LOG_DIR/00-Error.log" + +# Create or clear the error file +: > "$ERROR_FILE" + +# Check if the Install-Logs directory exists +if [ -d "$LOG_DIR" ]; then + # Iterate through each file in the Install-Logs directory + for log_file in "$LOG_DIR"/*; do + # Check if it's a file + if [ -f "$log_file" ]; then + # Search for lines containing the word "error" (case-insensitive) in the log file + if grep -i "error" "$log_file" > /dev/null; then + # If errors are found, add the filename to the error file + echo "${WARN} Errors found in file: $(basename "$log_file")" >> "$ERROR_FILE" + fi + fi + done + + # Check if the error file has any content + if [ -s "$ERROR_FILE" ]; then + echo "${ERROR} Errors encountered during Installation. See $ERROR_FILE for details." + else + echo "${OK} No errors were found." + fi +else + echo "Directory $LOG_DIR does not exist or could not be found." +fi + +printf "\n%.0s" {1..1} + # Check if either hyprland or hyprland-git is installed if dpkg -l | grep -qw hyprland || dpkg -l | grep -qw hyprland-git; then - printf "\n${OK} Yey! Installation Completed.\n" + printf "\n${OK} Hyprland is installed. However, there may some errors during installation " + printf "\n${CAT} Please see the errors in Install-Logs as stated above\n" sleep 2 printf "\n${NOTE} You can start Hyprland by typing Hyprland (IF SDDM is not installed) (note the capital H!).\n" printf "\n" @@ -267,7 +303,7 @@ if dpkg -l | grep -qw hyprland || dpkg -l | grep -qw hyprland-git; then fi else # Print error message if neither package is installed - printf "\n${WARN} Hyprland failed to install. Please check Install-Logs...\n\n" + printf "\n${NOTE} Hyprland failed to install. Please check Install-Logs...\n\n" exit 1 fi