From ba376a6c0ccb34a797f8d78c6da68de7481c544e Mon Sep 17 00:00:00 2001 From: Robin Candau Date: Wed, 22 Nov 2023 00:25:36 +0100 Subject: [PATCH 1/2] Make vim an optional dependency --- README.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index 34d82c3..8376f83 100644 --- a/README.md +++ b/README.md @@ -20,7 +20,7 @@ Features: - Automatic check and listing of every packages available for update (through [checkupdates](https://archlinux.org/packages/extra/x86_64/pacman-contrib/ "pacman-contrib package")). - Offers to print the latest Arch Linux news before applying updates (through [curl](https://archlinux.org/packages/core/x86_64/curl/ "curl package") and [htmlq](https://archlinux.org/packages/extra/x86_64/htmlq/ "htmlq package")). - Automatic check and listing of orphan packages and offering you to remove them. -- Helps you processing pacnew/pacsave files (through [pacdiff](https://archlinux.org/packages/extra/x86_64/pacman-contrib/ "pacman-contrib package")). +- Helps you processing pacnew/pacsave files (through [pacdiff](https://archlinux.org/packages/extra/x86_64/pacman-contrib/ "pacman-contrib package"), optionnally requires [vim](https://archlinux.org/packages/extra/x86_64/vim/ "vim package") as the default merge program). - Support for both [sudo](https://archlinux.org/packages/core/x86_64/sudo/ "sudo package") and [doas](https://archlinux.org/packages/extra/x86_64/opendoas/ "opendoas package"). - Optional support for AUR packages update (through [yay](https://aur.archlinux.org/packages/yay "yay AUR package") or [paru](https://aur.archlinux.org/packages/paru "paru AUR package")). - Optional support for Flatpak packages update (through [flatpak](https://archlinux.org/packages/extra/x86_64/flatpak "Flatpak package")). @@ -37,7 +37,7 @@ Install the [arch-update](https://aur.archlinux.org/packages/arch-update "arch-u Install dependencies: ```bash -sudo pacman -S --needed pacman-contrib curl htmlq diffutils vim +sudo pacman -S --needed pacman-contrib curl htmlq diffutils ``` Download the archive of the [latest stable release](https://github.com/Antiz96/arch-update/releases/latest) and extract it *(alternatively, you can clone this repository via `git`)*. From 3debf7e7f910c8b2998decc402a2bc4f49086312 Mon Sep 17 00:00:00 2001 From: Robin Candau Date: Wed, 22 Nov 2023 00:32:13 +0100 Subject: [PATCH 2/2] Correct typo + improve documentation --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 8376f83..9e4f56a 100644 --- a/README.md +++ b/README.md @@ -20,7 +20,7 @@ Features: - Automatic check and listing of every packages available for update (through [checkupdates](https://archlinux.org/packages/extra/x86_64/pacman-contrib/ "pacman-contrib package")). - Offers to print the latest Arch Linux news before applying updates (through [curl](https://archlinux.org/packages/core/x86_64/curl/ "curl package") and [htmlq](https://archlinux.org/packages/extra/x86_64/htmlq/ "htmlq package")). - Automatic check and listing of orphan packages and offering you to remove them. -- Helps you processing pacnew/pacsave files (through [pacdiff](https://archlinux.org/packages/extra/x86_64/pacman-contrib/ "pacman-contrib package"), optionnally requires [vim](https://archlinux.org/packages/extra/x86_64/vim/ "vim package") as the default merge program). +- Helps you processing pacnew/pacsave files (through [pacdiff](https://archlinux.org/packages/extra/x86_64/pacman-contrib/ "pacman-contrib package"), optionally requires [vim](https://archlinux.org/packages/extra/x86_64/vim/ "vim package") as the default [merge program](https://wiki.archlinux.org/title/Pacman/Pacnew_and_Pacsave#pacdiff "pacdiff merge program")). - Support for both [sudo](https://archlinux.org/packages/core/x86_64/sudo/ "sudo package") and [doas](https://archlinux.org/packages/extra/x86_64/opendoas/ "opendoas package"). - Optional support for AUR packages update (through [yay](https://aur.archlinux.org/packages/yay "yay AUR package") or [paru](https://aur.archlinux.org/packages/paru "paru AUR package")). - Optional support for Flatpak packages update (through [flatpak](https://archlinux.org/packages/extra/x86_64/flatpak "Flatpak package")).