manuel
/
live-build
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Replacing previous attempt of using config.cfg, now using scripts/config.sh and scripts/clean.sh instead.

This commit is contained in:
Daniel Baumann 2009-01-30 21:17:00 +01:00
parent 992a145afd
commit 730b248507
2 changed files with 17 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
helpers/lh_clean
View File

@ -9,6 +9,14 @@
set -e set -e
# Read meta config
if [ "${1}" != "autoconfig" ] && [ -e scripts/clean.sh ]
then
sh scripts/clean.sh ${@}
else
shift
fi
# Including common functions # Including common functions
. "${LH_BASE:-/usr/share/live-helper}"/functions.sh . "${LH_BASE:-/usr/share/live-helper}"/functions.sh

18
helpers/lh_config
View File

@ -9,6 +9,14 @@
set -e set -e
# Read meta config
if [ "${1}" != "autoconfig" ] && [ -e scripts/config.sh ]
then
sh scripts/config.sh ${@}
else
shift
fi
# Including common functions # Including common functions
. "${LH_BASE:-/usr/share/live-helper}"/functions.sh . "${LH_BASE:-/usr/share/live-helper}"/functions.sh
@ -710,15 +718,7 @@ fi
# Reading existing configuration # Reading existing configuration
Read_conffiles config/all config/common config/bootstrap config/chroot config/binary config/source Read_conffiles config/all config/common config/bootstrap config/chroot config/binary config/source
if [ -x config.cfg ] Local_arguments "${@}"
then
Local_arguments "$(./config.cfg) ${@}"
elif [ -r config.cfg ]
then
Local_arguments "$(sed -e '/^$/d' -e '/^#/d' config.cfg | sed -e '$!N;s/\n/ /g') ${@}"
else
Local_arguments "${@}"
fi
if [ -n "${_CONFFILE}" ] if [ -n "${_CONFFILE}" ]
then then