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

Export variables for hooks 

MR !173 removed the export of several variables moving/renaming them.
Continue to export both the new name and older compatibility name.

Closes: #992572
This commit is contained in:
Nick Brown 2021-08-20 12:35:31 +01:00 committed by Nick Brown
parent bd2a0e971b
commit df79eeafaf
1 changed files with 10 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
functions/configuration.sh
View File

@ -34,8 +34,8 @@ Prepare_config ()
_QUIET="${_QUIET:-false}"
_VERBOSE="${_VERBOSE:-false}"
LB_CONFIGURATION_VERSION="${LB_CONFIGURATION_VERSION:-${LIVE_BUILD_VERSION}}"
LIVE_CONFIGURATION_VERSION="${LB_CONFIGURATION_VERSION}" #for backwards compatibility with hooks
export LB_CONFIGURATION_VERSION="${LB_CONFIGURATION_VERSION:-${LIVE_BUILD_VERSION}}"
export LIVE_CONFIGURATION_VERSION="${LB_CONFIGURATION_VERSION}" #for backwards compatibility with hooks
LB_SYSTEM="${LB_SYSTEM:-live}"
@ -64,11 +64,11 @@ Prepare_config ()
DATE_UTC_OPTION=""
fi
LB_IMAGE_NAME="${LB_IMAGE_NAME:-live-image}"
LB_IMAGE_TYPE="${LB_IMAGE_TYPE:-iso-hybrid}"
export LB_IMAGE_NAME="${LB_IMAGE_NAME:-live-image}"
export LB_IMAGE_TYPE="${LB_IMAGE_TYPE:-iso-hybrid}"
#for backwards compatibility with hooks
LIVE_IMAGE_NAME="${LB_IMAGE_NAME}"
LIVE_IMAGE_TYPE="${LB_IMAGE_TYPE}"
export LIVE_IMAGE_NAME="${LB_IMAGE_NAME}"
export LIVE_IMAGE_TYPE="${LB_IMAGE_TYPE}"
if [ -z "${LB_ARCHITECTURE}" ]; then
if command -v dpkg >/dev/null; then
@ -90,13 +90,14 @@ Prepare_config ()
esac
fi
fi
export LB_ARCHITECTURE
# For backwards compat with custom hooks and conditional includes
LB_ARCHITECTURES="${LB_ARCHITECTURE}"
export LB_ARCHITECTURES="${LB_ARCHITECTURE}"
LB_ARCHIVE_AREAS="${LB_ARCHIVE_AREAS:-main}"
LB_PARENT_ARCHIVE_AREAS="${LB_PARENT_ARCHIVE_AREAS:-${LB_ARCHIVE_AREAS}}"
LB_ARCHIVE_AREAS="$(echo "${LB_ARCHIVE_AREAS}" | tr "," " ")"
LB_PARENT_ARCHIVE_AREAS="$(echo "${LB_PARENT_ARCHIVE_AREAS}" | tr "," " ")"
export LB_ARCHIVE_AREAS="$(echo "${LB_ARCHIVE_AREAS}" | tr "," " ")"
export LB_PARENT_ARCHIVE_AREAS="$(echo "${LB_PARENT_ARCHIVE_AREAS}" | tr "," " ")"
LB_BACKPORTS="${LB_BACKPORTS:-false}"
if [ -n "$LB_PARENT_DISTRIBUTION" ]; then