From f6af9f8631a80debc86f2b3e4fe6986a8d171898 Mon Sep 17 00:00:00 2001 From: JaKooLit Date: Thu, 30 May 2024 03:22:57 +0900 Subject: [PATCH 1/6] updated issue templates --- .github/ISSUE_TEMPLATE/bug_report.md | 4 ++++ .github/ISSUE_TEMPLATE/custom.md | 4 ++++ 2 files changed, 8 insertions(+) diff --git a/.github/ISSUE_TEMPLATE/bug_report.md b/.github/ISSUE_TEMPLATE/bug_report.md index c464a96..6d8c37d 100644 --- a/.github/ISSUE_TEMPLATE/bug_report.md +++ b/.github/ISSUE_TEMPLATE/bug_report.md @@ -7,6 +7,10 @@ labels: "Something isn't working" ## Bug Report +### Before submitting report + +[Kindly review the log files in Install-Logs directory. Some apps may have not installed properly.] + ### Description [Provide a clear and concise description of the bug.] diff --git a/.github/ISSUE_TEMPLATE/custom.md b/.github/ISSUE_TEMPLATE/custom.md index 1542d0a..75f01b4 100644 --- a/.github/ISSUE_TEMPLATE/custom.md +++ b/.github/ISSUE_TEMPLATE/custom.md @@ -7,6 +7,10 @@ labels: "custom" ## Custom Template +### Before submitting report + +[Kindly review the log files in Install-Logs directory. Some apps may have not installed properly.] + ### Description [Provide a clear and concise description of the issue or request.] From df4ff30d4a959171c21c223875dac9a123c30204 Mon Sep 17 00:00:00 2001 From: JaKooLit Date: Sat, 1 Jun 2024 03:07:51 +0900 Subject: [PATCH 2/6] modified zsh.sh for fzf installation --- install-scripts/zsh.sh | 18 +++++++++++++++++- 1 file changed, 17 insertions(+), 1 deletion(-) diff --git a/install-scripts/zsh.sh b/install-scripts/zsh.sh index 864dcd5..21f2668 100755 --- a/install-scripts/zsh.sh +++ b/install-scripts/zsh.sh @@ -5,7 +5,6 @@ zsh=( zsh zplug -fzf ) ## WARNING: DO NOT EDIT BEYOND THIS LINE IF YOU DON'T KNOW WHAT YOU ARE DOING! ## @@ -39,6 +38,23 @@ done printf "\n" +printf "${NOTE} Installing fzf from source...${RESET}\n" +if git clone --depth 1 https://github.com/junegunn/fzf.git; then + cd fzf || exit 1 + if ./install 2>&1 | tee -a "$MLOG" ; then + printf "${OK} fzf installed successfully.\n" 2>&1 | tee -a "$MLOG" + else + echo -e "${ERROR} Installation failed for fzf." 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 fzf." 2>&1 | tee -a "$LOG" +fi + +printf "\n" + ## Optional Pokemon color scripts while true; do read -p "${CAT} Do you want to install Pokemon color scripts? (y/n): " choice From a0f05de29dec20ba135d31e15583590793735887 Mon Sep 17 00:00:00 2001 From: JaKooLit Date: Sat, 1 Jun 2024 17:24:46 +0900 Subject: [PATCH 3/6] updated install script to install binary only --- install-scripts/zsh.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/install-scripts/zsh.sh b/install-scripts/zsh.sh index 21f2668..4a743f8 100755 --- a/install-scripts/zsh.sh +++ b/install-scripts/zsh.sh @@ -41,7 +41,7 @@ printf "\n" printf "${NOTE} Installing fzf from source...${RESET}\n" if git clone --depth 1 https://github.com/junegunn/fzf.git; then cd fzf || exit 1 - if ./install 2>&1 | tee -a "$MLOG" ; then + if ./install --bin 2>&1 | tee -a "$MLOG" ; then printf "${OK} fzf installed successfully.\n" 2>&1 | tee -a "$MLOG" else echo -e "${ERROR} Installation failed for fzf." 2>&1 | tee -a "$MLOG" From 7c9725385f09da1f8818fff9350120a0e2c4a4f3 Mon Sep 17 00:00:00 2001 From: JaKooLit Date: Sat, 1 Jun 2024 18:56:13 +0900 Subject: [PATCH 4/6] updated Thunar.sh to include gtk-3.0 config if not present --- assets/Thunar/accels.scm | 124 ++++++++++++++++++++++++++++++++++++ assets/gtk-3.0/bookmarks | 8 +++ assets/gtk-3.0/settings.ini | 17 +++++ install-scripts/thunar.sh | 2 +- 4 files changed, 150 insertions(+), 1 deletion(-) create mode 100644 assets/Thunar/accels.scm create mode 100644 assets/gtk-3.0/bookmarks create mode 100644 assets/gtk-3.0/settings.ini diff --git a/assets/Thunar/accels.scm b/assets/Thunar/accels.scm new file mode 100644 index 0000000..6421d9f --- /dev/null +++ b/assets/Thunar/accels.scm @@ -0,0 +1,124 @@ +; Thunar GtkAccelMap rc-file -*- scheme -*- +; this file is an automated accelerator map dump +; +; (gtk_accel_path "/ThunarStandardView/sort-by-type" "") +; (gtk_accel_path "/ThunarStatusBar/toggle-last-modified" "") +; (gtk_accel_path "/ThunarActionManager/cut" "x") +; (gtk_accel_path "/ThunarStandardView/sort-by-size" "") +; (gtk_accel_path "/ThunarWindow/file-menu" "") +; (gtk_accel_path "/ThunarWindow/close-tab" "w") +; (gtk_accel_path "/ThunarStatusBar/toggle-size" "") +; (gtk_accel_path "/ThunarWindow/new-window" "n") +; (gtk_accel_path "/ThunarWindow/clear-directory-specific-settings" "") +; (gtk_accel_path "/ThunarWindow/close-window" "q") +; (gtk_accel_path "/ThunarWindow/open-parent" "Up") +; (gtk_accel_path "/ThunarWindow/view-side-pane-menu" "") +; (gtk_accel_path "/ThunarStatusBar/toggle-size-in-bytes" "") +; (gtk_accel_path "/ThunarWindow/switch-previous-tab" "Page_Up") +; (gtk_accel_path "/ThunarBookmarks/3925ac2f7e4055558c447a20c2e047ad" "") +; (gtk_accel_path "/ThunarActionManager/open" "o") +; (gtk_accel_path "/ThunarStandardView/sort-ascending" "") +; (gtk_accel_path "/ThunarWindow/toggle-split-view" "F3") +; (gtk_accel_path "/ThunarActionManager/copy-2" "Insert") +; (gtk_accel_path "/ThunarActionManager/trash-delete" "Delete") +; (gtk_accel_path "/ThunarWindow/open-recent" "") +; (gtk_accel_path "/ThunarWindow/view-configure-toolbar" "") +; (gtk_accel_path "/ThunarStandardView/forward" "Right") +; (gtk_accel_path "/ThunarActionManager/restore" "") +; (gtk_accel_path "/ThunarBookmarks/9f0d843e4074095bf657b996746ec75c" "") +; (gtk_accel_path "/ThunarWindow/open-location-alt" "d") +; (gtk_accel_path "/ThunarBookmarks/a16339451d60726d0755a887bd755af2" "") +; (gtk_accel_path "/ThunarWindow/zoom-out-alt" "KP_Subtract") +; (gtk_accel_path "/ThunarStandardView/select-by-pattern" "s") +; (gtk_accel_path "/ThunarWindow/open-file-menu" "F10") +; (gtk_accel_path "/ThunarWindow/contents" "F1") +; (gtk_accel_path "/ThunarWindow/show-highlight" "") +; (gtk_accel_path "/ThunarBookmarks/44e0e66b3d753576f90ed75c87917822" "") +; (gtk_accel_path "/ThunarStandardView/sort-descending" "") +; (gtk_accel_path "/ThunarStandardView/sort-by-name" "") +; (gtk_accel_path "/ThunarStandardView/select-all-files" "a") +; (gtk_accel_path "/ThunarActionManager/execute" "") +; (gtk_accel_path "/ThunarStandardView/properties" "Return") +; (gtk_accel_path "/ThunarActionManager/cut-2" "") +; (gtk_accel_path "/ThunarStandardView/sort-by-dtime" "") +; (gtk_accel_path "/ThunarWindow/switch-next-tab" "Page_Down") +; (gtk_accel_path "/ThunarActionManager/paste-2" "Insert") +; (gtk_accel_path "/ThunarWindow/open-templates" "") +; (gtk_accel_path "/ThunarStatusBar/toggle-filetype" "") +; (gtk_accel_path "/ThunarWindow/close-all-windows" "w") +; (gtk_accel_path "/ThunarStandardView/create-document" "") +; (gtk_accel_path "/ThunarWindow/detach-tab" "") +; (gtk_accel_path "/ThunarBookmarks/978d3e7a7225e42c977fe94183792d87" "") +; (gtk_accel_path "/ThunarWindow/cancel-search" "Escape") +; (gtk_accel_path "/ThunarWindow/zoom-in-alt2" "equal") +; (gtk_accel_path "/ThunarShortcutsPane/sendto-shortcuts" "d") +; (gtk_accel_path "/ThunarActionManager/undo" "z") +; (gtk_accel_path "/ThunarStandardView/toggle-sort-order" "") +; (gtk_accel_path "/ThunarWindow/reload-alt" "F5") +; (gtk_accel_path "/ThunarWindow/view-location-selector-entry" "") +; (gtk_accel_path "/ThunarActionManager/paste" "v") +; (gtk_accel_path "/ThunarWindow/zoom-in-alt1" "KP_Add") +; (gtk_accel_path "/ThunarWindow/view-menubar" "m") +; (gtk_accel_path "/ThunarStandardView/back" "Left") +; (gtk_accel_path "/ThunarWindow/open-desktop" "") +; (gtk_accel_path "/ThunarWindow/view-as-detailed-list" "2") +; (gtk_accel_path "/ThunarActionManager/restore-show" "") +; (gtk_accel_path "/ThunarWindow/zoom-out" "minus") +; (gtk_accel_path "/ThunarStatusBar/toggle-display-name" "") +; (gtk_accel_path "/ThunarWindow/sendto-menu" "") +; (gtk_accel_path "/ThunarWindow/go-menu" "") +; (gtk_accel_path "/ThunarWindow/remove-from-recent" "") +; (gtk_accel_path "/ThunarActionManager/open-with-other" "") +; (gtk_accel_path "/ThunarStandardView/invert-selection" "") +; (gtk_accel_path "/ThunarWindow/view-side-pane-shortcuts" "b") +; (gtk_accel_path "/ThunarWindow/view-location-selector-menu" "") +; (gtk_accel_path "/ThunarWindow/edit-menu" "") +; (gtk_accel_path "/ThunarWindow/reload" "r") +; (gtk_accel_path "/ThunarActionManager/move-to-trash" "") +; (gtk_accel_path "/ThunarActionManager/copy" "c") +; (gtk_accel_path "/ThunarActionManager/delete-3" "KP_Delete") +; (gtk_accel_path "/ThunarWindow/toggle-side-pane" "F9") +; (gtk_accel_path "/ThunarStandardView/sort-by-mtime" "") +; (gtk_accel_path "/ThunarBookmarks/a50db0a56a1e6c31df6bf18c55eb78cd" "") +; (gtk_accel_path "/ThunarStandardView/arrange-items-menu" "") +; (gtk_accel_path "/ThunarStandardView/unselect-all-files" "Escape") +; (gtk_accel_path "/ThunarWindow/open-computer" "") +; (gtk_accel_path "/ThunarWindow/bookmarks-menu" "") +; (gtk_accel_path "/ThunarWindow/toggle-image-preview" "") +; (gtk_accel_path "/ThunarWindow/view-as-icons" "1") +; (gtk_accel_path "/ThunarActionManager/delete-2" "Delete") +; (gtk_accel_path "/ThunarWindow/zoom-in" "plus") +; (gtk_accel_path "/ThunarStandardView/rename" "F2") +; (gtk_accel_path "/ThunarWindow/open-location" "l") +; (gtk_accel_path "/ThunarWindow/view-as-compact-list" "3") +; (gtk_accel_path "/ThunarWindow/view-menu" "") +; (gtk_accel_path "/ThunarWindow/search" "f") +; (gtk_accel_path "/ThunarWindow/new-tab" "t") +; (gtk_accel_path "/ThunarWindow/zoom-reset" "0") +; (gtk_accel_path "/ThunarWindow/contents/help-menu" "") +; (gtk_accel_path "/ThunarActionManager/open-in-new-tab" "p") +; (gtk_accel_path "/ThunarWindow/view-location-selector-buttons" "") +; (gtk_accel_path "/ThunarActionManager/redo" "z") +; (gtk_accel_path "/ThunarWindow/open-trash" "") +; (gtk_accel_path "/ThunarActionManager/open-in-new-window" "o") +; (gtk_accel_path "/ThunarWindow/view-statusbar" "") +; (gtk_accel_path "/ThunarActionManager/open-location" "") +; (gtk_accel_path "/ThunarStandardView/duplicate" "") +; (gtk_accel_path "/ThunarBookmarks/c76f07a72d3c8ef5d4bf8e84c8981221" "") +; (gtk_accel_path "/ThunarActionManager/trash-delete-2" "KP_Delete") +; (gtk_accel_path "/ThunarStandardView/create-folder" "n") +; (gtk_accel_path "/ThunarWindow/open-home" "Home") +; (gtk_accel_path "/ThunarWindow/show-hidden" "h") +; (gtk_accel_path "/ThunarStandardView/set-default-app" "") +; (gtk_accel_path "/ThunarWindow/empty-trash" "") +; (gtk_accel_path "/ThunarStandardView/back-alt" "BackSpace") +; (gtk_accel_path "/ThunarWindow/preferences" "") +; (gtk_accel_path "/ThunarBookmarks/8ea92a0b35875a5a65ffafcf02698ce8" "") +; (gtk_accel_path "/ThunarActionManager/delete" "") +; (gtk_accel_path "/ThunarWindow/view-side-pane-tree" "e") +; (gtk_accel_path "/ThunarWindow/open-file-system" "") +; (gtk_accel_path "/ThunarWindow/open-network" "") +; (gtk_accel_path "/ThunarActionManager/sendto-desktop" "") +; (gtk_accel_path "/ThunarStandardView/make-link" "") +; (gtk_accel_path "/ThunarWindow/zoom-reset-alt" "KP_0") +; (gtk_accel_path "/ThunarWindow/about" "") diff --git a/assets/gtk-3.0/bookmarks b/assets/gtk-3.0/bookmarks new file mode 100644 index 0000000..6178222 --- /dev/null +++ b/assets/gtk-3.0/bookmarks @@ -0,0 +1,8 @@ +file:///home/ja/Documents +file:///home/ja/Downloads +file:///home/ja/Pictures +file:///home/ja/Videos +file:///home/ja/00shared-drives/shared-1TB +file:///home/ja/00shared-drives/shared-500G +file:///home/ja/00shared-drives/shared-500G/000-git-packages +file:///home/ja/00shared-drives/shared-500G/Music-shared diff --git a/assets/gtk-3.0/settings.ini b/assets/gtk-3.0/settings.ini new file mode 100644 index 0000000..371fe59 --- /dev/null +++ b/assets/gtk-3.0/settings.ini @@ -0,0 +1,17 @@ +[Settings] +gtk-theme-name=Andromeda-dark +gtk-icon-theme-name=Flat-Remix-Blue-Dark +gtk-font-name=Fira Code Semi-Bold 14 +gtk-cursor-theme-name=Bibata-Modern-Ice +gtk-cursor-theme-size=24 +gtk-toolbar-style=GTK_TOOLBAR_ICONS +gtk-toolbar-icon-size=GTK_ICON_SIZE_LARGE_TOOLBAR +gtk-button-images=1 +gtk-menu-images=1 +gtk-enable-event-sounds=1 +gtk-enable-input-feedback-sounds=0 +gtk-xft-antialias=1 +gtk-xft-hinting=1 +gtk-xft-hintstyle=hintslight +gtk-xft-rgba=rgb +gtk-application-prefer-dark-theme=1 diff --git a/install-scripts/thunar.sh b/install-scripts/thunar.sh index 9d7705f..08cfc82 100755 --- a/install-scripts/thunar.sh +++ b/install-scripts/thunar.sh @@ -32,7 +32,7 @@ printf "${NOTE} Installing Thunar Packages...\n" done # Check for existing configs and copy if does not exist -for DIR1 in Thunar xfce4; do +for DIR1 in gtk-3.0 Thunar xfce4; do DIRPATH=~/.config/$DIR1 if [ -d "$DIRPATH" ]; then echo -e "${NOTE} Config for $DIR1 found, no need to copy." 2>&1 | tee -a "$LOG" From 873b625deb1237e2b0b987574f70c8af42a5cc19 Mon Sep 17 00:00:00 2001 From: JaKooLit Date: Tue, 4 Jun 2024 01:12:20 +0900 Subject: [PATCH 5/6] removed fzf (headache) --- assets/.zshrc | 6 ------ install-scripts/zsh.sh | 17 ----------------- 2 files changed, 23 deletions(-) diff --git a/assets/.zshrc b/assets/.zshrc index 0e8e32c..5f74178 100644 --- a/assets/.zshrc +++ b/assets/.zshrc @@ -18,10 +18,4 @@ source $ZSH/oh-my-zsh.sh # Project page: https://gitlab.com/phoneybadger/pokemon-colorscripts#on-other-distros-and-macos #pokemon-colorscripts --no-title -s -r -# Set-up FZF key bindings (CTRL R for fuzzy history finder) -source <(fzf --zsh) -HISTFILE=~/.zsh_history -HISTSIZE=10000 -SAVEHIST=10000 -setopt appendhistory diff --git a/install-scripts/zsh.sh b/install-scripts/zsh.sh index 4a743f8..c0b73ad 100755 --- a/install-scripts/zsh.sh +++ b/install-scripts/zsh.sh @@ -38,23 +38,6 @@ done printf "\n" -printf "${NOTE} Installing fzf from source...${RESET}\n" -if git clone --depth 1 https://github.com/junegunn/fzf.git; then - cd fzf || exit 1 - if ./install --bin 2>&1 | tee -a "$MLOG" ; then - printf "${OK} fzf installed successfully.\n" 2>&1 | tee -a "$MLOG" - else - echo -e "${ERROR} Installation failed for fzf." 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 fzf." 2>&1 | tee -a "$LOG" -fi - -printf "\n" - ## Optional Pokemon color scripts while true; do read -p "${CAT} Do you want to install Pokemon color scripts? (y/n): " choice From bc2d656582ff5481d0a4ee8079a5bcb105be2854 Mon Sep 17 00:00:00 2001 From: JaKooLit Date: Tue, 4 Jun 2024 02:00:41 +0900 Subject: [PATCH 6/6] - switched over to source install for imagemagick - removal of fzf for Debian and Ubuntu (headache) --- CHANGELOGS.md | 4 ++ install-scripts/00-hypr-pkgs.sh | 1 - install-scripts/force-install.sh | 29 ------------ install-scripts/hypr-eco.sh | 4 +- install-scripts/hyprwayland-scanner.sh | 2 +- install-scripts/imagemagick.sh | 62 ++++++++++++++++++++++++++ install-scripts/wallust.sh | 1 - install.sh | 2 +- 8 files changed, 70 insertions(+), 35 deletions(-) delete mode 100755 install-scripts/force-install.sh create mode 100755 install-scripts/imagemagick.sh 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"