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:
parent
c3dad3f18f
commit
dd74cb6b47
|
@ -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}"
|
||||
|
|
Loading…
Reference in New Issue