Skip to content

Commit

Permalink
Merge branch 'Antiz96:main' into main
Browse files Browse the repository at this point in the history
  • Loading branch information
Delor3an91 authored Nov 6, 2024
2 parents 1a97c7d + d51e015 commit 15927d0
Show file tree
Hide file tree
Showing 17 changed files with 96 additions and 65 deletions.
15 changes: 15 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,21 @@

All notable changes to this project will be documented in this file.

## [v3.4.0](https://github.com/Antiz96/arch-update/releases/tag/v3.4.0) - 2024-11-06

### Features

- Add support for pikaur ([#276](https://github.com/Antiz96/arch-update/pull/276)) - ([7b5d08b](https://github.com/Antiz96/arch-update/commit/7b5d08b1aa7870850fe8cfdcfd23ead3b01e9cd3)) by @Antiz96

### Styling

- Update lines numbers in po files ([#277](https://github.com/Antiz96/arch-update/pull/277)) - ([33f2377](https://github.com/Antiz96/arch-update/commit/33f23773f3e3eab47ceeaf2c3273e669af0e0c76)) by @Antiz96
- Add spacing to improve wording style ([#274](https://github.com/Antiz96/arch-update/pull/274)) - ([a8cfb27](https://github.com/Antiz96/arch-update/commit/a8cfb2713f7e1ede517b37fe836147bb5b5073ef)) by @Antiz96

### Miscellaneous

- Improve style / wording in internal documentation ([#278](https://github.com/Antiz96/arch-update/pull/278)) - ([d58dcee](https://github.com/Antiz96/arch-update/commit/d58dceef286894f0265bff9e7f3ead66a84f79db)) by @Antiz96

## [v3.3.0](https://github.com/Antiz96/arch-update/releases/tag/v3.3.0) - 2024-10-06

### Features
Expand Down
16 changes: 8 additions & 8 deletions CONTRIBUTING.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

Thank you for considering contributing to [Arch-Update](https://github.com/Antiz96/arch-update)!

With the exception of the [general rules](#general-rules) (which **must** be acknowledged and applied in any contribution/interaction in this project), these guidelines represents an ideal target & standards that I would like this project to follow but may not all be **strictly** enforced (depending on the situation).
With the exception of the [general rules](#general-rules) (which **must** be acknowledged and applied in any contribution / interaction in this project), these guidelines represents an ideal target & standards that I would like this project to follow but may not all be **strictly** enforced (depending on the situation).

Please, don't refrain yourself from contributing if you feel that your contribution may not entirely follow these guidelines (or if you're struggling applying some of them). I value your contributions much more than the strict application of these guidelines!

Expand All @@ -18,7 +18,7 @@ Please, don't refrain yourself from contributing if you feel that your contribut

These general rules apply to **every** contributions (whatever the type). They should **always** be acknowledged and **strictly** followed in any circumstances:

Basic common sense applies to every contributions & discussions: stay polite and respectful, no flaming/trolling/spamming or any kind of discrimination/harassment, avoid controversial topics *(specifically if it has nothing to do with this project whatsoever)*, etc...
Basic common sense applies to every contributions & discussions: stay polite and respectful, no flaming / trolling / spamming or any kind of discrimination / harassment, avoid controversial topics *(specifically if it has nothing to do with this project whatsoever)*, etc...

Use English as much as possible for contributions & discussions. If required, I can also speak French, but it's important that contributions & discussions remain intelligible to most people.

Expand All @@ -39,7 +39,7 @@ Make sure to create your merge request from a dedicated branch (do not use the `

### Open an issue first

Apart from trivial changes (like simple typo fixes), it is advised to first [open an issue](#open-an-issue) to expose and discuss your changes, verify its feasibility/necessity and agree on the specifications.
Apart from trivial changes (like simple typo fixes), it is advised to first [open an issue](#open-an-issue) to expose and discuss your changes, verify its feasibility / necessity and agree on the specifications.

### Coding style

Expand All @@ -63,15 +63,15 @@ Commits must follow the [conventional commits](https://www.conventionalcommits.o

This project uses the following commit types:

- chore: for internal/miscellaneous changes
- feat: for new features (or improvements/additions to existing features)
- chore: for internal / miscellaneous changes
- feat: for new features (or improvements / additions to existing features)
- fix: for bug fixes
- doc: for documentation only changes
- style: For changes that do not affect the meaning of the code (white-space, formatting, typo fixes, etc...)

An optional scope can be provided to the commit type if relevant (for instance when a change is specific to a precise part of the project), like so: `type(scope): commit message`.

If a commit introduces a breaking change, its type must contain a `!` (e.g. `feat!: commit message`) and/or a `BREAKING CHANGE:` mention should be added at the end of your commit message (e.g. `BREAKING CHANGE: description of the breaking change`).
If a commit introduces a breaking change, its type must contain a `!` (e.g. `feat!: commit message`) and / or a `BREAKING CHANGE:` mention should be added at the end of your commit message (e.g. `BREAKING CHANGE: description of the breaking change`).

Here are a few examples of the expected commit format:

Expand All @@ -94,9 +94,9 @@ Fixes https://github.com/Antiz96/arch-update/issues/103
```

```text
doc(man): Add the -l/--list option to man pages
doc(man): Add the -l / --list option to man pages
The recently introduced -l/--list option was missing from the man page
The recently introduced -l / --list option was missing from the man page
```

```text
Expand Down
24 changes: 13 additions & 11 deletions README-fr.md
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ Fonctionnalités :
- Vérification automatique des mises à jour du noyau en attente nécessitant un redémarrage et propose de redémarrer s'il y en a une.
- Vérification automatique des services nécessitant un redémarrage après mise à jour et propose de les redémarrer s'il y en a.
- Support de `sudo`, `doas` et `run0`.
- Prise en charge optionnelle des paquets AUR (via `yay` ou `paru`).
- Prise en charge optionnelle des paquets AUR (via `paru`, `yay` ou `pikaur`).
- Prise en charge optionnelle des paquets Flatpak.
- Prise en charge optionnelle des notifications de bureau lors de nouvelles mises à jour disponibles.

Expand All @@ -55,12 +55,13 @@ sudo pacman -S --needed pacman-contrib archlinux-contrib curl fakeroot htmlq dif

Dépendances optionnelles supplémentaires dont vous pourriez avoir besoin ou que vous pourriez souhaiter :

- [yay](https://aur.archlinux.org/packages/yay): Support des paquets AUR
- [paru](https://aur.archlinux.org/packages/paru): Support des paquets AUR
- [flatpak](https://archlinux.org/packages/extra/x86_64/flatpak/): Support des paquets Flatpak
- [libnotify](https://archlinux.org/packages/extra/x86_64/libnotify/): Support des notifications de bureau lors de nouvelles mises à jour disponibles (voir <https://wiki.archlinux.org/title/Desktop_notifications>)
- [vim](https://archlinux.org/packages/extra/x86_64/vim/): Programme de fusion par défaut pour pacdiff
- [qt6-wayland](https://archlinux.org/packages/extra/x86_64/qt6-wayland/): Support de l'applet systray sur Wayland
- [paru](https://aur.archlinux.org/packages/paru) : Support des paquets AUR
- [yay](https://aur.archlinux.org/packages/yay) : Support des paquets AUR
- [pikaur](https://aur.archlinux.org/packages/pikaur) : Support des paquets AUR
- [flatpak](https://archlinux.org/packages/extra/x86_64/flatpak/) : Support des paquets Flatpak
- [libnotify](https://archlinux.org/packages/extra/x86_64/libnotify/) : Support des notifications de bureau lors de nouvelles mises à jour disponibles (voir <https://wiki.archlinux.org/title/Desktop_notifications>)
- [vim](https://archlinux.org/packages/extra/x86_64/vim/) : Programme de fusion par défaut pour pacdiff
- [qt6-wayland](https://archlinux.org/packages/extra/x86_64/qt6-wayland/) : Support de l'applet systray sur Wayland

Téléchargez l'archive de la [dernière version stable](https://github.com/Antiz96/arch-update/releases/latest) et extrayez la *(vous pouvez également cloner ce référentiel via `git clone`)*.

Expand Down Expand Up @@ -155,7 +156,7 @@ Alternativement, vous pouvez voir la liste des mises à jour disponible dans le

![dropdown_menu_fr](https://github.com/user-attachments/assets/60c3c0d8-8091-4047-b8da-ce8f8bc72476)

Quand l'icône du systray est cliquée, elle affiche la liste des paquets disponibles pour la mise à jour dans une fenêtre de terminal et demande la confirmation de l'utilisateur pour procéder à l'installation (peut aussi être lancé en exécutant la commande `arch-update`, requiert [yay](https://aur.archlinux.org/packages/yay "yay") ou [paru](https://aur.archlinux.org/packages/paru "paru") pour le support des paquets AUR et [flatpak](https://archlinux.org/packages/extra/x86_64/flatpak/) pour le support des paquets Flatpak).
Quand l'icône du systray est cliquée, elle affiche la liste des paquets disponibles pour la mise à jour dans une fenêtre de terminal et demande la confirmation de l'utilisateur pour procéder à l'installation (peut aussi être lancé en exécutant la commande `arch-update`, requiert [paru](https://aur.archlinux.org/packages/paru "paru"), [yay](https://aur.archlinux.org/packages/yay "yay") ou [pikaur](https://aur.archlinux.org/packages/pikaur "pikaur") pour le support des paquets AUR et [flatpak](https://archlinux.org/packages/extra/x86_64/flatpak/) pour le support des paquets Flatpak).

![listing_packages-FR](https://github.com/Antiz96/arch-update/assets/53110319/60547cde-f327-46f8-907c-61bf9bbee6c5)

Expand Down Expand Up @@ -238,7 +239,7 @@ Les options prises en charge sont :
- NoVersion # Ne pas afficher les modifications de versions des paquets lors du listing des mises à jour en attente (y compris lors de l'utilisation de l'option `-l / --list`).
- AlwaysShowNews # Toujours afficher les Arch news avant de mettre à jour, peu importe s'il y en a une nouvelle depuis la dernière exécution ou non.
- NewsNum=[Num] # Nombre de Arch news à affcher avant la mise à jour et avec l'option `-n / --news` (voir la page de manuel arch-update(1) pour plus de details). La valeur par défaut est 5.
- AURHelper=[AUR Helper] # AUR helper à utiliser pour la prise en charge des paquets AUR. Les valeurs valides sont `paru` ou `yay`. Si cette option n'est pas spécifiée, Arch-Update utilisera le premier AUR helper disponible dans l'ordre suivant : `paru` puis `yay` (si aucun des deux n'est installé, Arch-Update ne prendra pas en compte les paquets AUR).
- AURHelper=[AUR Helper] # AUR helper à utiliser pour la prise en charge des paquets AUR. Les valeurs valides sont `paru`, `yay` ou `pikaur`. Si cette option n'est pas spécifiée, Arch-Update utilisera le premier AUR helper disponible dans l'ordre suivant : `paru` puis `yay` puis `pikaur` (si aucun d'eux n'est installé, Arch-Update ne prendra pas en compte les paquets AUR).
- PrivilegeElevationCommand=[Cmd] # Commande à utiliser pour l'élévation de privilège. Les valeurs valides sont `sudo`, `doas` ou `run0`. Si cette option n'est pas spécifiée, Arch-Update utilisera la première commande disponible dans l'odre suivant : `sudo`, `doas` puis `run0`.
- KeepOldPackages=[Num] # Nombre d'anciennes versions de paquets à conserver dans le cache de pacman. La valeur par défaut est 3.
- KeepUninstalledPackages=[Num] # Nombre de versions de paquets désinstallés à conserver dans le cache de pacman. La valeur par défaut est 0.
Expand All @@ -254,9 +255,10 @@ Pour plus d'informations, consultez la page de manuel arch-update.conf(5).

### Support du AUR

Arch-Update prend en charge les paquets AUR si **yay** ou **paru** est installé :
Arch-Update prend en charge les paquets AUR si **paru**, **yay** ou **pikaur** est installé :
Voir <https://github.com/morganamilo/paru> et <https://aur.archlinux.org/packages/paru>
Voir <https://github.com/Jguer/yay> et <https://aur.archlinux.org/packages/yay>
Voir <https://github.com/morganamilo/paru> et <https://aur.archlinux.org/packages/paru>
Voir <https://github.com/actionless/pikaur> et <https://aur.archlinux.org/packages/pikaur>

### Support de Flatpak

Expand Down
14 changes: 8 additions & 6 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ Features:
- Automatic check for pending kernel updates requiring a reboot to be applied and offers to do so if there's one.
- Automatic check for services requiring a post upgrade restart and offers to do so if there are.
- Support for `sudo`, `doas` & `run0`.
- Optional support for AUR packages (through `yay` or `paru`).
- Optional support for AUR packages (through `paru`, `yay` or `pikaur`).
- Optional support for Flatpak packages.
- Optional support for desktop notifications on new available updates.

Expand All @@ -55,8 +55,9 @@ sudo pacman -S --needed pacman-contrib archlinux-contrib curl fakeroot htmlq dif

Additional optional dependencies you might need or want:

- [yay](https://aur.archlinux.org/packages/yay): AUR Packages support
- [paru](https://aur.archlinux.org/packages/paru): AUR Packages support
- [yay](https://aur.archlinux.org/packages/yay): AUR Packages support
- [pikaur](https://aur.archlinux.org/packages/pikaur): AUR Packages support
- [flatpak](https://archlinux.org/packages/extra/x86_64/flatpak/): Flatpak Packages support
- [libnotify](https://archlinux.org/packages/extra/x86_64/libnotify/): Desktop notifications support on new available updates (see <https://wiki.archlinux.org/title/Desktop_notifications>)
- [vim](https://archlinux.org/packages/extra/x86_64/vim/): Default merge program for pacdiff
Expand Down Expand Up @@ -155,7 +156,7 @@ Alternatively, you can see the list of available updates in the dropdown menu en

![dropdown_menu](https://github.com/user-attachments/assets/4621d7d2-a9e4-40c3-851f-ee1687e6cf1e)

When the systray icon is left-clicked, it prints the list of packages available for updates inside a terminal window and asks for the user's confirmation to proceed with the installation (it can also be launched by running the `arch-update` command, requires [yay](https://aur.archlinux.org/packages/yay "yay") or [paru](https://aur.archlinux.org/packages/paru "paru") for AUR packages support and [flatpak](https://archlinux.org/packages/extra/x86_64/flatpak/) for Flatpak packages support).
When the systray icon is left-clicked, it prints the list of packages available for updates inside a terminal window and asks for the user's confirmation to proceed with the installation (it can also be launched by running the `arch-update` command, requires [paru](https://aur.archlinux.org/packages/paru "paru"), [yay](https://aur.archlinux.org/packages/yay "yay") or [pikaur](https://aur.archlinux.org/packages/pikaur "pikaur") for AUR packages support and [flatpak](https://archlinux.org/packages/extra/x86_64/flatpak/) for Flatpak packages support).

![listing_packages](https://github.com/Antiz96/arch-update/assets/53110319/ed552414-0dff-4cff-84d2-6ff13340259d)

Expand Down Expand Up @@ -238,7 +239,7 @@ The supported options are:
- NoVersion # Do not show versions changes for packages when listing pending updates (including when using the `-l / --list` option).
- AlwaysShowNews # Always display Arch news before updating, regardless of whether there's a new one since the last run or not.
- NewsNum=[Num] # Number of Arch news to display before updating and with the `-n / --news` option (see the arch-update(1) man page for more details). Defaults to 5.
- AURHelper=[AUR Helper] # AUR helper to be used for AUR packages support. Valid values are `paru` or `yay`. If this option is not set, Arch-Update will use the first available AUR helper in the following order: `paru` then `yay` (in case none of them is installed, Arch-Update will not take AUR packages into account).
- AURHelper=[AUR Helper] # AUR helper to be used for AUR packages support. Valid values are `paru`, `yay` or `pikaur`. If this option is not set, Arch-Update will use the first available AUR helper in the following order: `paru` then `yay` then `pikaur` (in case none of them is installed, Arch-Update will not take AUR packages into account).
- PrivilegeElevationCommand=[Cmd] # Command to be used for privilege elevation. Valid values are `sudo`, `doas` or `run0`. If this option is not set, Arch-Update will use the first available command in the following order: `sudo`, `doas` then `run0`.
- KeepOldPackages=[Num] # Number of old packages' versions to keep in pacman's cache. Defaults to 3.
- KeepUninstalledPackages=[Num] # Number of uninstalled packages' versions to keep in pacman's cache. Defaults to 0.
Expand All @@ -254,9 +255,10 @@ For more information, see the arch-update.conf(5) man page.

### AUR support

Arch-Update supports AUR packages if **yay** or **paru** is installed:
Arch-Update supports AUR packages if **paru**, **yay** or **pikaur** is installed:
See <https://github.com/morganamilo/paru> and <https://aur.archlinux.org/packages/paru>
See <https://github.com/Jguer/yay> and <https://aur.archlinux.org/packages/yay>
See <https://github.com/morganamilo/paru> and <https://aur.archlinux.org/packages/paru>
See <https://github.com/actionless/pikaur> and <https://aur.archlinux.org/packages/pikaur>

### Flatpak support

Expand Down
4 changes: 2 additions & 2 deletions RELEASE.md
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
export TAG="X.Y.Z"
```

- Bump version in where necessary:
- Bump version where necessary:

```bash
sed -i "s/$(arch-update -V | cut -f2 -d " ")/${TAG}/g" doc/man/arch-update.* doc/man/fr/arch-update.* po/* src/arch-update.sh
Expand Down Expand Up @@ -36,7 +36,7 @@ git tag v${TAG} -u D33FAA16B937F3B2 -m "v${TAG}"
git push origin v${TAG}
```

- Create a release on GitHub, copy/paste release notes from the changelog and sign the auto-generated source tarball:
- Create a release on GitHub, copy / paste release notes from the changelog and sign the auto-generated source tarball:

```bash
cd ~/Downloads
Expand Down
Loading

0 comments on commit 15927d0

Please sign in to comment.