wbrawner/distribution
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Remove duplication, ensure order of operations.

Browse source
This commit is contained in:
fewtarius 2023-06-22 11:43:49 +00:00
parent cab907cff9
commit 8b97ff3bff
No known key found for this signature in database
GPG key ID: F4AE55305D1B8C1A
1 changed files with 17 additions and 27 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

44
config/options
View file

@ -46,26 +46,6 @@ BUILD_DATE=$(date)
# include helper functions
. config/functions
# read GLOBAL options if available
if [ -f "${HOME}/${DISTRO}/options" ]; then
. "${HOME}/${DISTRO}/options"
fi
# read DISTRO options if available
if [ -f "${DISTRO_DIR}/${DISTRO}/options" ]; then
. "${DISTRO_DIR}/${DISTRO}/options"
fi
# read PROJECT options if available
if [ -f "${PROJECT_DIR}/${PROJECT}/options" ]; then
. "${PROJECT_DIR}/${PROJECT}/options"
fi
# read DEVICE options if available
if [ -f "${PROJECT_DIR}/${PROJECT}/devices/${DEVICE}/options" ]; then
. "${PROJECT_DIR}/${PROJECT}/devices/${DEVICE}/options"
fi
# projects can set KERNEL_NAME (kernel.img)
KERNEL_NAME="${KERNEL_NAME:-KERNEL}"
@ -110,19 +90,29 @@ CCACHE_CACHE_SIZE="20G"
# suitable zstd level, currently 1.
CCACHE_COMPRESSLEVEL="0"
# read global persistent options from $HOME if available
if [ -f "${HOME}/.${DISTRO}/options" ]; then
. "${HOME}/.${DISTRO}/options"
# read GLOBAL options if available
if [ -f "${HOME}/${DISTRO}/options" ]; then
. "${HOME}/${DISTRO}/options"
fi
# read local persistent options from ${ROOT} if available
# read ROOT options from ${ROOT} if available
if [ -f "${ROOT}/.${DISTRO}/options" ]; then
. "${ROOT}/.${DISTRO}/options"
fi
# read global persistent options from ${DOCKER_WORK_DIR} if available
if [ -f "${DOCKER_WORK_DIR}/.jelos/options" ]; then
. "${DOCKER_WORK_DIR}/.jelos/options"
# read DISTRO options if available
if [ -f "${DISTRO_DIR}/${DISTRO}/options" ]; then
. "${DISTRO_DIR}/${DISTRO}/options"
fi
# read PROJECT options if available
if [ -f "${PROJECT_DIR}/${PROJECT}/options" ]; then
. "${PROJECT_DIR}/${PROJECT}/options"
fi
# read DEVICE options if available
if [ -f "${PROJECT_DIR}/${PROJECT}/devices/${DEVICE}/options" ]; then
. "${PROJECT_DIR}/${PROJECT}/devices/${DEVICE}/options"
fi
if [ "${LOCAL_CCACHE_SUPPORT}" = "yes" ] && [ -z "${CCACHE_DISABLE}" ]; then