Correcting lh_configs config.cfg handling, so that it's at least working when not using config.cfg. Will have to be fixed properly later.

This commit is contained in:
Daniel Baumann 2009-01-28 01:15:03 +01:00
parent c3dad3f18f
commit dd74cb6b47
1 changed files with 4 additions and 4 deletions

View File

@ -712,14 +712,14 @@ Read_conffiles config/all config/common config/bootstrap config/chroot config/bi
if [ -x config.cfg ]
then
EXTRA_ARGUMENTS="$(./config.cfg)"
Local_arguments "$(./config.cfg) ${@}"
elif [ -r config.cfg ]
then
EXTRA_ARGUMENTS="$(sed -e '/^$/d' -e '/^#/d' config.cfg | sed -e '$!N;s/\n/ /g')"
Local_arguments "$(sed -e '/^$/d' -e '/^#/d' config.cfg | sed -e '$!N;s/\n/ /g') ${@}"
else
Local_arguments "${@}"
fi
Local_arguments "${EXTRA_ARGUMENTS} ${@}"
if [ -n "${_CONFFILE}" ]
then
Read_conffiles "${_CONFFILE}"