Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Add the --show-config option that displays the current configuration file #177

Merged
merged 1 commit into from
Jun 20, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions README-fr.md
Original file line number Diff line number Diff line change
Expand Up @@ -159,6 +159,7 @@ Options :
-n, --news [Num] Afficher les dernieres Arch News, vous pouvez optionellement spécifier le nombre de Arch news à afficher avec `--news [Num]` (e.g. `--news 10`)
-D, --debug Afficher les traces de débogage
--gen-config Générer un fichier de configuration par défaut/exemple (voir la page de manuel arch-update.conf(5) pour plus de détails)
--show-config Afficher le fichier de configuration `arch-update.conf` actuellement utilisé (s'il existe)
--tray Lancer l'applet systray d'Arch-Update
-h, --help Afficher ce message d'aide et quitter
-V, --version Afficher les informations de version et quitter
Expand All @@ -173,6 +174,7 @@ Codes de sortie :
6 Erreur lors de l'appel de la commande reboot pour appliquer une mise à jour du noyau en attente
7 Aucune mise à jour en attente durant l'utilisation de l'option `-l/--list`
8 Erreur lors de la génération d'un fichier de configuration avec l'option `--gen-config`
9 Erreur lors de la lecture du fichier de configuration avec l'option `--show-config`
```

Pour plus d'informations, consultez la page de manuel arch-update(1).
Expand Down
2 changes: 2 additions & 0 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -159,6 +159,7 @@ Options:
-n, --news [Num] Display latest Arch News, you can optionally specify the number of Arch news to display with `--news [Num]` (e.g. `--news 10`)
-D, --debug Display debug traces
--gen-config Generate a default/example configuration file (see the arch-update.conf(5) man page for more details)
--show-config Display the `arch-update.conf` configuration file currently used (if it exists)
--tray Launch the Arch-Update systray applet
-h, --help Display this help message and exit
-V, --version Display version information and exit
Expand All @@ -173,6 +174,7 @@ Exit Codes:
6 Error when calling the reboot command to apply a pending kernel update
7 No pending update when using the `-l/--list` option
8 Error when generating a configuration file with the `--gen-config` option
9 Error when reading the configuration file with the `--show-config` option
```

For more information, see the arch-update(1) man page.
Expand Down
8 changes: 8 additions & 0 deletions doc/man/arch-update.1
Original file line number Diff line number Diff line change
Expand Up @@ -60,6 +60,10 @@ Display debug traces.
.B \-\-gen\-config
.RB "Generate a default/example configuration file (see the " "arch-update.conf(5) " "man page for more details)."

.TP
.B \-\-show\-config
.RB "Display the " "arch-update.conf " "configuration file currently used (if it exists)."

.TP
.B \-\-tray
.RB "Launch the Arch-Update systray applet (you can alternatively start/enable the associated systemd service like so: " "systemctl \-\-user enable \-\-now arch-update-tray.service").
Expand Down Expand Up @@ -211,6 +215,10 @@ Error when calling the reboot command to apply a pending kernel update
.B 8
.RB "Error when generating a configuration file with the " "--gen-config " "option"

.TP
.B 9
.RB "Error when reading the configuration file with the " "--show-config " "option"

.SH SEE ALSO
.BR checkupdates (8),
.BR pacman (8),
Expand Down
8 changes: 8 additions & 0 deletions doc/man/fr/arch-update.1
Original file line number Diff line number Diff line change
Expand Up @@ -60,6 +60,10 @@ Afficher les traces de débogage.
.B \-\-gen\-config
.RB "Générer un fichier de configuration par défaut/exemple (voir la page de manuel " "arch-update.conf(5) " "pour plus de détails)."

.TP
.B \-\-show\-config
.RB "Afficher le fichier de configuration " "arch-update.conf " "actuellement utilisé (s'il existe)."

.TP
.B \-\-tray
.RB "Lancer l'applet systray d'Arch-Update (alternativement, vous pouvez démarrer/activer le service systemd associé comme ceci : " "systemctl \-\-user enable \-\-now arch-update-tray.service").
Expand Down Expand Up @@ -211,6 +215,10 @@ Erreur lors de l'appel de la commande reboot pour appliquer une mise à jour du
.B 8
.RB "Erreur lors de la génération d'un fichier de configuration avec l'option " "--gen-config"

.TP
.B 9
.RB "Erreur lors de la lecture du fichier de configuration avec l'option " "--show-config"

.SH VOIR AUSSI
.BR checkupdates (8),
.BR pacman (8),
Expand Down
5 changes: 5 additions & 0 deletions po/arch-update.pot
Original file line number Diff line number Diff line change
Expand Up @@ -470,6 +470,11 @@ msgstr ""
msgid "The '${config_file}' configuration file has been generated"
msgstr ""

#: src/script/arch-update.sh:724
#, sh-format
msgid "No configuration file found"
msgstr ""

#: src/script/arch-update-tray.py:118
msgid "Run Arch-Update"
msgstr ""
Expand Down
5 changes: 5 additions & 0 deletions po/fr.po
Original file line number Diff line number Diff line change
Expand Up @@ -506,6 +506,11 @@ msgstr ""
msgid "The '${config_file}' configuration file has been generated"
msgstr "Le fichier de configuration '${config_file}' a été généré"

#: src/script/arch-update.sh:724
#, sh-format
msgid "No configuration file found"
msgstr "Aucun fichier de configuration n'a été trouvé"

#: src/script/arch-update-tray.py:118
msgid "Run Arch-Update"
msgstr "Lancer Arch-Update"
Expand Down
1 change: 1 addition & 0 deletions res/completions/arch-update.bash
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@ _arch-update() {
-n --news
-D --debug
--gen-config
--show-config
--tray
-h --help
-V --version')
Expand Down
1 change: 1 addition & 0 deletions res/completions/arch-update.fish
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@ complete -c arch-update -s d -l devel -d 'Include AUR development packages updat
complete -c arch-update -s n -l news -d 'Display latest Arch news'
complete -c arch-update -s D -l debug -d 'Display debug traces'
complete -c arch-update -l gen-config -d 'Generate a default/example configuration file'
complete -c arch-update -l show-config -d 'Display the current configuration file'
complete -c arch-update -l tray -d 'Launch the Arch-Update systray applet'
complete -c arch-update -s h -l help -d 'Display the help message'
complete -c arch-update -s V -l version -d 'Display version information'
1 change: 1 addition & 0 deletions res/completions/arch-update.zsh
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@ opts=(
{-n,--news}'[Display latest Arch news]'
{-D,--debug}'[Display debug traces]'
{--gen-config}'[Generate a default/example configuration file]'
{--show-config}'[Display the current configuration file]'
{--tray}'[Launch the Arch-Update systray applet]'
{-h,--help}'[Display the help message]'
{-V,--version}'[Display version information]'
Expand Down
8 changes: 8 additions & 0 deletions src/script/arch-update.sh
Original file line number Diff line number Diff line change
Expand Up @@ -719,6 +719,14 @@ case "${option}" in
info_msg "$(eval_gettext "The '\${config_file}' configuration file has been generated")"
fi
;;
--show-config)
if [ ! -f "${config_file}" ]; then
error_msg "$(eval_gettext "No configuration file found")"
exit 9
else
cat "${config_file}" || exit 9
fi
;;
--tray)
if [ ! -f "${statedir}/current_state" ]; then
state_up_to_date
Expand Down