From f929f204862ebdc3b7ad6ebea352e3545c6c0cb2 Mon Sep 17 00:00:00 2001 From: Davide Madrisan Date: Wed, 7 Nov 2012 22:24:08 +0100 Subject: [PATCH] config-getvar: fix the help message (incorrect list of default files) Signed-off-by: Davide Madrisan --- ChangeLog | 8 ++++++++ lib/libcfg.lib.in | 3 +++ plugins/config-getvar.in | 3 ++- po/it/config-getvar.po | 3 +++ 4 files changed, 16 insertions(+), 1 deletion(-) diff --git a/ChangeLog b/ChangeLog index 6954a57..86c8204 100644 --- a/ChangeLog +++ b/ChangeLog @@ -9,6 +9,14 @@ Fri Nov 09 2012 Davide Madrisan * po/it/spec-create - Davide Madrisan: Updated. ++ bugfix + * plugins/config-getvar, lib/libcfg.lib - Davide Madrisan: + Fix the help message (incorrect list of default files). + ++ update + * po/it/config-getvar - Davide Madrisan: + Updated. + ------------------------------------------------------------------------------- Changes in version 1.14.0 diff --git a/lib/libcfg.lib.in b/lib/libcfg.lib.in index 8a4d035..96896a8 100644 --- a/lib/libcfg.lib.in +++ b/lib/libcfg.lib.in @@ -21,6 +21,9 @@ default_cfg=(\ `ls /etc/@package@.conf /etc/@package@.d/*.conf \ ~/.@package@ ~/.@package@.d/*.conf 2>/dev/null`) +default_cfg_strlist="/etc/@package@.conf /etc/@package@.d/*.conf" +default_cfg_user_strlist="~/.@package@ ~/.@package@.d/*.conf" + # check if the user configurations file for autospec is present function config.check4user() { local user_data=$(getent passwd 2>/dev/null | grep "x:$(id -u):") diff --git a/plugins/config-getvar.in b/plugins/config-getvar.in index aec1022..db3290e 100644 --- a/plugins/config-getvar.in +++ b/plugins/config-getvar.in @@ -56,7 +56,8 @@ function usage() { "$"where the above options mean"": --eval "$"Print the value of the configuration variable "" -C, --config "$"Use an alternate configuration file"" "" - "$"Default files:"" ${default_cfg[0]}, ${default_cfg[1]}"" + "$"Default files:"" $default_cfg_strlist"" + "$"Default user files:"" $default_cfg_user_strlist"" "$"Operation modes"": -h, --help "$"Print this help, then exit"" diff --git a/po/it/config-getvar.po b/po/it/config-getvar.po index 6a493d4..e21d2c8 100644 --- a/po/it/config-getvar.po +++ b/po/it/config-getvar.po @@ -51,6 +51,9 @@ msgstr "Utilizza un file di configurazione alternativo" msgid "Default files:" msgstr "File di default:" +msgid "Default user files:" +msgstr "File di default utente:" + msgid "Operation modes" msgstr "Modalità operative"