diff options
| author | Daniel Baumann <daniel@debian.org> | 2010-09-13 21:49:20 +0200 |
|---|---|---|
| committer | Daniel Baumann <daniel@debian.org> | 2010-09-13 21:49:20 +0200 |
| commit | ac2c30e3792f5b7715c67dce3791ed59b41c72b9 (patch) | |
| tree | f3772fff4ac37ac11c25576995c64ef464f010f3 | |
| parent | 2df5d8b065fac78cad684c878a8b0ccdbff3edfe (diff) | |
| download | vyos-live-build-ac2c30e3792f5b7715c67dce3791ed59b41c72b9.tar.gz vyos-live-build-ac2c30e3792f5b7715c67dce3791ed59b41c72b9.zip | |
Updating auto/scripts handling.
| -rwxr-xr-x | functions/common.sh | 2 | ||||
| -rwxr-xr-x | functions/defaults.sh | 2 | ||||
| -rwxr-xr-x | scripts/build/lb_config | 6 |
3 files changed, 8 insertions, 2 deletions
diff --git a/functions/common.sh b/functions/common.sh index d11dec167..1c221d1cd 100755 --- a/functions/common.sh +++ b/functions/common.sh @@ -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}" diff --git a/functions/defaults.sh b/functions/defaults.sh index b9b475ff2..193d59b1e 100755 --- a/functions/defaults.sh +++ b/functions/defaults.sh @@ -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}" diff --git a/scripts/build/lb_config b/scripts/build/lb_config index afb6935d8..487d81cc3 100755 --- a/scripts/build/lb_config +++ b/scripts/build/lb_config @@ -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 |