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

Updating auto/scripts handling.

This commit is contained in:
Daniel Baumann 2010-09-13 21:49:20 +02:00
parent 8488808879
commit 8c155c17c8
3 changed files with 8 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
functions/common.sh
View File

@ -12,4 +12,4 @@ PACKAGE="live-build"
VERSION="2.0~a28-1"
CONFIG_VERSION="$(echo ${VERSION} | awk -F- '{ print $1 }')"
PATH="${PWD}/auto/helpers:${PATH}"
PATH="${PWD}/auto/scripts:${PATH}"

2
functions/defaults.sh
View File

@ -226,7 +226,7 @@ Set_defaults ()
LB_TEMPLATES="${LB_BASE}/templates"
fi
# Setting live helper options
# Setting live build options
_BREAKPOINTS="${_BREAKPOINTS:-false}"
_COLOR="${_COLOR:-false}"
_DEBUG="${_DEBUG:-false}"

6
scripts/build/lb_config
View File

@ -1288,6 +1288,7 @@ LB_SOURCE_IMAGES="${LB_SOURCE_IMAGES}"
EOF
mkdir -p auto/functions
mkdir -p auto/scripts
if [ "${CONFIG}" = "clone" ] # FIXME
then
@ -1354,6 +1355,11 @@ then
rmdir --ignore-fail-on-non-empty auto/functions
fi
if [ -d auto/scripts]
then
rmdir --ignore-fail-on-non-empty auto/scripts
fi
if [ -d auto ]
then
rmdir --ignore-fail-on-non-empty auto