diff --git a/CHANGELOGS.md b/CHANGELOGS.md index 3358ace..846d1b8 100644 --- a/CHANGELOGS.md +++ b/CHANGELOGS.md @@ -1,5 +1,9 @@ ## Changelogs +## 04 June 2024 +- switched over to source install for imagemagick +- removal of fzf for Debian and Ubuntu (headache) + ## 26 May 2024 - Added fzf for zsh (CTRL R to invoke FZF history) diff --git a/install-scripts/00-hypr-pkgs.sh b/install-scripts/00-hypr-pkgs.sh index 9698417..d8ff5cc 100755 --- a/install-scripts/00-hypr-pkgs.sh +++ b/install-scripts/00-hypr-pkgs.sh @@ -16,7 +16,6 @@ hypr_package=( grim gvfs gvfs-backends - imagemagick kitty nano pavucontrol diff --git a/install-scripts/force-install.sh b/install-scripts/force-install.sh deleted file mode 100755 index 472574d..0000000 --- a/install-scripts/force-install.sh +++ /dev/null @@ -1,29 +0,0 @@ -#!/bin/bash -# 💫 https://github.com/JaKooLit 💫 # -# force reinstall packages cause it says its already installed but still not -# some users report that they need to install this packages - -force=( - imagemagick -) - -## WARNING: DO NOT EDIT BEYOND THIS LINE IF YOU DON'T KNOW WHAT YOU ARE DOING! ## -# Determine the directory where the script is located -SCRIPT_DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )" - -# Change the working directory to the parent directory of the script -PARENT_DIR="$SCRIPT_DIR/.." -cd "$PARENT_DIR" || exit 1 - -source "$(dirname "$(readlink -f "$0")")/Global_functions.sh" - -# Set the name of the log file to include the current date and time -LOG="Install-Logs/install-$(date +%d-%H%M%S)_force.log" - -printf "${NOTE} Force installing packages...\n" - for FORCE in "${force[@]}"; do - sudo apt-get --reinstall install -y "$FORCE" 2>&1 | tee -a "$LOG" - [ $? -ne 0 ] && { echo -e "\e[1A\e[K${ERROR} - $FORCE Package installation failed, Please check the installation logs"; exit 1; } - done - -clear \ No newline at end of file diff --git a/install-scripts/hypr-eco.sh b/install-scripts/hypr-eco.sh index a975115..7798ed9 100755 --- a/install-scripts/hypr-eco.sh +++ b/install-scripts/hypr-eco.sh @@ -41,6 +41,6 @@ printf "${NOTE} Installing pyprland\n" curl https://raw.githubusercontent.com/hyprland-community/pyprland/main/scripts/get-pypr | sh 2>&1 | tee -a "$LOG" -pip install pyprland 2>&1 | tee -a "$LOG" +pip install pyprland --break-system-packages 2>&1 | tee -a "$LOG" + -clear diff --git a/install-scripts/hyprwayland-scanner.sh b/install-scripts/hyprwayland-scanner.sh index 88537c8..1dfa70c 100755 --- a/install-scripts/hyprwayland-scanner.sh +++ b/install-scripts/hyprwayland-scanner.sh @@ -6,7 +6,7 @@ scan_depend=( libpugixml-dev ) #specific branch or release -scan_tag="v0.3.8" +scan_tag="v0.3.9" ## WARNING: DO NOT EDIT BEYOND THIS LINE IF YOU DON'T KNOW WHAT YOU ARE DOING! ## # Determine the directory where the script is located diff --git a/install-scripts/imagemagick.sh b/install-scripts/imagemagick.sh new file mode 100755 index 0000000..6f8ced4 --- /dev/null +++ b/install-scripts/imagemagick.sh @@ -0,0 +1,62 @@ +#!/bin/bash +# 💫 https://github.com/JaKooLit 💫 # +# imagemagick from source # + +depend=( +build-essential +) + + +## WARNING: DO NOT EDIT BEYOND THIS LINE IF YOU DON'T KNOW WHAT YOU ARE DOING! ## +# Determine the directory where the script is located +SCRIPT_DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )" + +# Change the working directory to the parent directory of the script +PARENT_DIR="$SCRIPT_DIR/.." +cd "$PARENT_DIR" || exit 1 + +source "$(dirname "$(readlink -f "$0")")/Global_functions.sh" + +# Set the name of the log file to include the current date and time +LOG="Install-Logs/install-$(date +%d-%H%M%S)_image.log" +MLOG="install-$(date +%d-%H%M%S)_image.log" + +# Installing depencies +for PKG1 in "${depend[@]}"; do + install_package "$PKG1" 2>&1 | tee -a "$LOG" + if [ $? -ne 0 ]; then + echo -e "\033[1A\033[K${ERROR} - $PKG1 Package installation failed, Please check the installation logs" + exit 1 + fi +done + +## +printf "${NOTE} Installing ImageMagick from source...\n" + +# Check if folder exists and remove it +if [ -d "ImageMagick" ]; then + printf "${NOTE} Removing existing ImageMagick folder...\n" + rm -rf "ImageMagick" +fi + +# Clone and build ImageMagick +printf "${NOTE} Installing ImageMagick...\n" +if git clone --depth 1 https://github.com/ImageMagick/ImageMagick.git; then + cd ImageMagick || exit 1 + ./configure + make + if sudo make install 2>&1 | tee -a "$MLOG" ; then + sudo ldconfig /usr/local/lib + printf "${OK} ImageMagick installed successfully.\n" 2>&1 | tee -a "$MLOG" + else + echo -e "${ERROR} Installation failed for ImageMagick." 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 ImageMagick." 2>&1 | tee -a "$LOG" +fi + +clear + diff --git a/install-scripts/wallust.sh b/install-scripts/wallust.sh index e90c71e..b9c8415 100755 --- a/install-scripts/wallust.sh +++ b/install-scripts/wallust.sh @@ -4,7 +4,6 @@ depend=( librust-jpeg-decoder-dev -imagemagick rustup ) diff --git a/install.sh b/install.sh index e86df68..5444494 100755 --- a/install.sh +++ b/install.sh @@ -158,10 +158,10 @@ sudo apt update execute_script "00-dependencies.sh" execute_script "00-hypr-pkgs.sh" execute_script "fonts.sh" +execute_script "imagemagick.sh" execute_script "swappy.sh" execute_script "swww.sh" execute_script "rofi-wayland.sh" -execute_script "force-install.sh" execute_script "wallust.sh" execute_script "ags.sh" execute_script "hyprlang.sh"