openmamba/autospec
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

libcfg.lib: exit if the given configuration files do not exist

Browse Source 
Signed-off-by: Davide Madrisan <davide.madrisan@gmail.com>
This commit is contained in:
Davide Madrisan 2012-11-18 20:09:15 +01:00
parent d659a5d779
commit c84fa05747
1 changed files with 7 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
lib/libcfg.lib.in
View File

@ -102,8 +102,15 @@ missing variable in the configuration file"" -- \`$cfg_var'"
# load configuration files # load configuration files
function cfg_load_files() { function cfg_load_files() {
local cfg_file
notify.debug "$FUNCNAME: loading configuration files..." notify.debug "$FUNCNAME: loading configuration files..."
if [ "$1" ]; then if [ "$1" ]; then
# this will catch some error cases when the files do not exist,
# like /etc/donotexists.conf or /etc/nofiles*.conf
[ "`ls $1 2>/dev/null`" ] ||
notify.error $"configuration file not found:"" $1"
# select a different list of user configuration files # select a different list of user configuration files
cfgfile_list=(\ cfgfile_list=(\
`ls /etc/@package@.conf /etc/@package@.d/*.conf $1 2>/dev/null`) `ls /etc/@package@.conf /etc/@package@.d/*.conf $1 2>/dev/null`)
@ -114,7 +121,6 @@ function cfg_load_files() {
notify.debug "$FUNCNAME: cfgfile_list = (${cfgfile_list[*]})" notify.debug "$FUNCNAME: cfgfile_list = (${cfgfile_list[*]})"
local cfg_file
local cfg_files_num=0 local cfg_files_num=0
for cfg_file in ${cfgfile_list[*]}; do for cfg_file in ${cfgfile_list[*]}; do
if [ -e "$cfg_file" ]; then if [ -e "$cfg_file" ]; then