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.

Sign up for GitHub

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

fix: Exit if the diff prog editor set in arch-update.conf isn't found #250

Merged
merged 1 commit into from
Sep 25, 2024
Merged

fix: Exit if the diff prog editor set in arch-update.conf isn't found #250

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
1 change: 1 addition & 0 deletions README-fr.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -195,6 +195,7 @@ Codes de sortie :
12 Erreur lors du traitement des fichiers pacnew
13 Erreur lors de l'édition du fichier de configuration avec l'option `--edit-config`
14 Le dossier de librairies n'a pas été trouvé
15 L'éditeur "diff prog" défini dans le fichier de configuration `arch-update.conf` n'est pas disponible
```

Pour plus d'informations, consultez la page de manuel arch-update(1).
Expand Down
1 change: 1 addition & 0 deletions README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -195,6 +195,7 @@ Exit Codes:
12 Error during the pacnew files processing
13 Error when editing the configuration file with the `--edit-config` option
14 Libraries directory not found
15 The diff prog editor set in the `arch-update.conf` configuration file isn't found
```

For more information, see the arch-update(1) man page.
Expand Down
4 changes: 4 additions & 0 deletions doc/man/arch-update.1
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -249,6 +249,10 @@ Error when restarting services that require a post upgrade restart
.B 14
Libraries directory not found

.TP
.B 15
The diff prog editor set in the arch-update.conf configuration file isn't found

.SH SEE ALSO
.BR checkupdates (8),
.BR pacman (8),
Expand Down
4 changes: 4 additions & 0 deletions doc/man/fr/arch-update.1
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -249,6 +249,10 @@ Erreur lors du traitement des fichiers pacnew
.B 14
Le dossier de librairies n'a pas été trouvé

.TP
.B 15
L'éditeur "diff prog" défini dans le fichier de configuration arch-update.conf n'est pas disponible

.SH VOIR AUSSI
.BR checkupdates (8),
.BR pacman (8),
Expand Down
21 changes: 14 additions & 7 deletions po/arch-update.pot
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,45 +26,52 @@ msgstr ""
msgid "${update_number} updates available"
msgstr ""

#: src/lib/common.sh:52
#: src/lib/common.sh:90
#, sh-format
msgid "WARNING"
msgstr ""

#: src/lib/common.sh:58
#: src/lib/common.sh:96
#, sh-format
msgid "ERROR"
msgstr ""

#: src/lib/common.sh:63
#: src/lib/common.sh:101
#, sh-format
msgid "Press \"enter\" to continue "
msgstr ""

#: src/lib/common.sh:69
#: src/lib/common.sh:107
#, sh-format
msgid "Press \"enter\" to quit "
msgstr ""

#: src/lib/common.sh:85
#: src/lib/common.sh:123
#, sh-format
msgid ""
"The ${aur_helper} AUR helper set for AUR packages support in the arch-update."
"conf configuration file is not found\\n"
msgstr ""

#: src/lib/common.sh:107
#: src/lib/common.sh:145
#, sh-format
msgid "A privilege elevation command is required (sudo, doas or run0)\\n"
msgstr ""

#: src/lib/common.sh:112
#: src/lib/common.sh:150
#, sh-format
msgid ""
"The ${su_cmd} command set for privilege escalation in the arch-update.conf "
"configuration file is not found\\n"
msgstr ""

#: src/lib/common.sh:158
#, sh-format
msgid ""
"The ${diff_prog} editor set for visualizing/editing differences of pacnew "
"files in the arch-update.conf configuration file is not found\\n"
msgstr ""

#: src/lib/edit-config.sh:9 src/lib/show-config.sh:9
#, sh-format
msgid ""
Expand Down
23 changes: 16 additions & 7 deletions po/fr.po
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,27 +26,27 @@ msgstr "${update_number} mise à jour disponible"
msgid "${update_number} updates available"
msgstr "${update_number} mises à jour disponibles"

#: src/lib/common.sh:52
#: src/lib/common.sh:90
#, sh-format
msgid "WARNING"
msgstr "AVERTISSEMENT"

#: src/lib/common.sh:58
#: src/lib/common.sh:96
#, sh-format
msgid "ERROR"
msgstr "ERREUR"

#: src/lib/common.sh:63
#: src/lib/common.sh:101
#, sh-format
msgid "Press \"enter\" to continue "
msgstr "Appuyez sur \"entrée\" pour continuer "

#: src/lib/common.sh:69
#: src/lib/common.sh:107
#, sh-format
msgid "Press \"enter\" to quit "
msgstr "Appuyez sur \"entrée\" pour quitter "

#: src/lib/common.sh:85
#: src/lib/common.sh:123
#, sh-format
msgid ""
"The ${aur_helper} AUR helper set for AUR packages support in the arch-update."
Expand All @@ -55,12 +55,12 @@ msgstr ""
"Le AUR helper ${aur_helper} défini pour le support des paquets AUR dans le fichier de configuration "
"arch-update.conf n'est pas disponible\\n"

#: src/lib/common.sh:107
#: src/lib/common.sh:145
#, sh-format
msgid "A privilege elevation command is required (sudo, doas or run0)\\n"
msgstr "Une commande d'élévation de privilège est requise (sudo, doas ou run0)\\n"

#: src/lib/common.sh:112
#: src/lib/common.sh:150
#, sh-format
msgid ""
"The ${su_cmd} command set for privilege escalation in the arch-update.conf "
Expand All @@ -69,6 +69,15 @@ msgstr ""
"La commande ${su_cmd} définie pour l'élévation de privilège dans le fichier "
"de configuration arch-update.conf n'est pas disponible\\n"

#: src/lib/common.sh:158
#, sh-format
msgid ""
"The ${diff_prog} editor set for visualizing/editing differences of pacnew "
"files in the arch-update.conf configuration file is not found\\n"
msgstr ""
"L'éditeur ${diff_prog} défini pour la visualisation/l'édition des différences des fichiers pacnew "
"dans le fichier de configuration arch-update.conf n'est pas disponible\\n"

#: src/lib/edit-config.sh:9 src/lib/show-config.sh:9
#, sh-format
msgid ""
Expand Down
13 changes: 9 additions & 4 deletions src/lib/common.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -154,10 +154,15 @@ fi

# Definition of the diff program to use (if it is set in the arch-update.conf configuration file)
if [ -n "${diff_prog}" ]; then
if [ "${su_cmd}" == "sudo" ]; then
diff_prog_opt=("DIFFPROG=${diff_prog}")
elif [ "${su_cmd}" == "run0" ]; then
diff_prog_opt+=("--setenv=DIFFPROG=${diff_prog}")
if ! command -v "${diff_prog}" > /dev/null; then
error_msg "$(eval_gettext "The \${diff_prog} editor set for visualizing/editing differences of pacnew files in the arch-update.conf configuration file is not found\n")" && quit_msg
exit 15
else
if [ "${su_cmd}" == "sudo" ]; then
diff_prog_opt=("DIFFPROG=${diff_prog}")
elif [ "${su_cmd}" == "run0" ]; then
diff_prog_opt+=("--setenv=DIFFPROG=${diff_prog}")
fi
fi
fi

Expand Down