From 9cfff838cdcf621c4b8cfc822b1b1bef54d23f9d Mon Sep 17 00:00:00 2001 From: JaKooLit Date: Wed, 29 May 2024 05:09:41 +0900 Subject: [PATCH 1/8] updated install.sh --- README.md | 4 ++++ install.sh | 10 ++++++++++ 2 files changed, 14 insertions(+) diff --git a/README.md b/README.md index d8c5feb..4b8226b 100644 --- a/README.md +++ b/README.md @@ -102,6 +102,9 @@ https://github.com/JaKooLit/Hyprland-Dots/assets/85185940/50d53755-0f11-45d6-991 - the wallpaper offered to be downloaded towards the end is from this [`REPO`](https://github.com/JaKooLit/Wallpaper-Bank) - The dotfiles that will be pulled by this installer is only specific. Since newer dotfiles might not work properly +> [!NOTE] +> There is a lot of changes on Hyprland v0.40.0. And because of this, the latest Hyprland-Dots compatible for this script will be Hyprland-Dots v2.2.12 [`LINK`](https://github.com/JaKooLit/Hyprland-Dots/releases/tag/v2.2.12) + #### ✨ Some notes on this installer / Prerequisites - This script is meant to install in Ubuntu 24.04 LTS - If you are using gnome already, DO NOT install SDDM. GDM will work. Apart from GDM and SDDM, any other Login Manager may not work nor launch Hyprland. However, hyprland can be launched through tty by type Hyprland @@ -219,6 +222,7 @@ log into your account - [ ] Installing SDDM if or any other Login Manager installed. See [`Issue 2 - SDDM`](https://github.com/JaKooLit/Debian-Hyprland/issues/2) - [ ] network is down or become unmanaged [`This`](https://askubuntu.com/questions/71159/network-manager-says-device-not-managed) might help - [ ] pyprland is a hit and miss. Drop down not working, zooming is hit and miss +- [ ] See note above about Hyprland-Dots newer version incompatibility #### 📒 Final Notes diff --git a/install.sh b/install.sh index 35e3450..3e32590 100755 --- a/install.sh +++ b/install.sh @@ -25,6 +25,16 @@ echo echo "$(tput setaf 3)NOTE: If you are installing on a VM, ensure to enable 3D acceleration else Hyprland wont start! $(tput sgr0)" echo +printf "\n%.0s" {1..4} +echo "$(tput bold)$(tput setaf 3)ATTENTION!!!! VERY IMPORTANT NOTICE!!!! $(tput sgr0)" +echo "$(tput bold)$(tput setaf 7)Latest Hyprland compatible with Ubuntu 24.04 is only up to v0.39.1 $(tput sgr0)" +echo "$(tput bold)$(tput setaf 7)This was due to old version is wayland-protocols available in Ubuntu Repo $(tput sgr0)" +echo "$(tput bold)$(tput setaf 7)Because of the above, the latest Hyprland-Dots compatible will only be v2.2.12 $(tput sgr0)" +echo "$(tput bold)$(tput setaf 7)Newer dots may not be compatible.$(tput sgr0)" +echo "$(tput bold)$(tput setaf 7)This would also mean that support for this project might slowdown$(tput sgr0)" +echo "$(tput bold)$(tput setaf 7)Please be guided$(tput sgr0)" +printf "\n%.0s" {1..3} + read -p "$(tput setaf 6)Would you like to proceed? (y/n): $(tput sgr0)" proceed if [ "$proceed" != "y" ]; then From 07855e98c96d67713a4d626ede36848cc4dbee62 Mon Sep 17 00:00:00 2001 From: JaKooLit Date: Thu, 30 May 2024 03:22:58 +0900 Subject: [PATCH 2/8] 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 1aa189e58a199b593d9d291f8c2cde50db4d00a7 Mon Sep 17 00:00:00 2001 From: JaKooLit Date: Sat, 1 Jun 2024 03:07:53 +0900 Subject: [PATCH 3/8] 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 ee3f64bee907c10a786ce9e2c0dd65b338b05efe Mon Sep 17 00:00:00 2001 From: JaKooLit Date: Sat, 1 Jun 2024 17:24:47 +0900 Subject: [PATCH 4/8] 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 8ede015d3db52ee7a6b1088c8ff2ec7081ddb370 Mon Sep 17 00:00:00 2001 From: JaKooLit Date: Sat, 1 Jun 2024 18:56:14 +0900 Subject: [PATCH 5/8] 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 0e6ce2a974c1203ae226ecb781ca1611c282a8ca Mon Sep 17 00:00:00 2001 From: JaKooLit Date: Tue, 4 Jun 2024 01:12:21 +0900 Subject: [PATCH 6/8] removed fzf (headache) --- assets/.zshrc | 7 ------- install-scripts/zsh.sh | 17 ----------------- 2 files changed, 24 deletions(-) diff --git a/assets/.zshrc b/assets/.zshrc index 2ccff57..5f74178 100644 --- a/assets/.zshrc +++ b/assets/.zshrc @@ -19,10 +19,3 @@ source $ZSH/oh-my-zsh.sh #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 1db079e34c02591cc8d1c4384ddb9f6d19874682 Mon Sep 17 00:00:00 2001 From: JaKooLit Date: Tue, 4 Jun 2024 02:00:42 +0900 Subject: [PATCH 7/8] - 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/imagemagick.sh | 61 ++++++++++++++++++++++++++++++++ install-scripts/wallust.sh | 1 - install.sh | 2 +- 6 files changed, 66 insertions(+), 32 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 be97835..7498c0a 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 a6f5841..055bd7c 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/imagemagick.sh b/install-scripts/imagemagick.sh new file mode 100755 index 0000000..9c0b492 --- /dev/null +++ b/install-scripts/imagemagick.sh @@ -0,0 +1,61 @@ +#!/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 3e32590..9a5ce1d 100755 --- a/install.sh +++ b/install.sh @@ -160,12 +160,12 @@ sudo apt update # Install hyprland packages execute_script "00-dependencies.sh" execute_script "00-hypr-pkgs.sh" +execute_script "imagemagick.sh" execute_script "fonts.sh" execute_script "swappy.sh" execute_script "swww.sh" execute_script "rofi-wayland.sh" execute_script "wallust.sh" -execute_script "force-install.sh" execute_script "ags.sh" execute_script "hyprlang.sh" execute_script "hyprlock.sh" From b231080a3865a2b30fbdf854a1fd077aa19d6233 Mon Sep 17 00:00:00 2001 From: JaKooLit Date: Tue, 4 Jun 2024 02:57:50 +0900 Subject: [PATCH 8/8] updated install.sh and dotfiles.sh --- install-scripts/dotfiles.sh | 2 +- install.sh | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/install-scripts/dotfiles.sh b/install-scripts/dotfiles.sh index e0c470f..4347def 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.2.12" +specific_version="v2.2.13" ## 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 9a5ce1d..a3b8aa5 100755 --- a/install.sh +++ b/install.sh @@ -29,7 +29,7 @@ printf "\n%.0s" {1..4} echo "$(tput bold)$(tput setaf 3)ATTENTION!!!! VERY IMPORTANT NOTICE!!!! $(tput sgr0)" echo "$(tput bold)$(tput setaf 7)Latest Hyprland compatible with Ubuntu 24.04 is only up to v0.39.1 $(tput sgr0)" echo "$(tput bold)$(tput setaf 7)This was due to old version is wayland-protocols available in Ubuntu Repo $(tput sgr0)" -echo "$(tput bold)$(tput setaf 7)Because of the above, the latest Hyprland-Dots compatible will only be v2.2.12 $(tput sgr0)" +echo "$(tput bold)$(tput setaf 7)Because of the above, the latest Hyprland-Dots compatible will only be v2.2.13 $(tput sgr0)" echo "$(tput bold)$(tput setaf 7)Newer dots may not be compatible.$(tput sgr0)" echo "$(tput bold)$(tput setaf 7)This would also mean that support for this project might slowdown$(tput sgr0)" echo "$(tput bold)$(tput setaf 7)Please be guided$(tput sgr0)"