opensourcemirror
/
opnsense-tools
mirror of https://github.com/opnsense/tools.git
1
0
Fork 0
Code Issues Releases Wiki Activity

build: fix missing overide for lists; closes #318

This commit is contained in:
Franco Fichtner 2022-09-30 11:03:38 +02:00
parent 94911884ba
commit d412689c99
6 changed files with 29 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
build/audit.sh
View File

@ -31,7 +31,9 @@ SELF=audit
. ./common.sh
PORTSLIST=$(list_packages ${CONFIGDIR}/ports.conf)
if [ -z "${PORTSLIST}" ]; then
PORTSLIST=$(list_packages ${CONFIGDIR}/ports.conf)
fi
setup_stage ${STAGEDIR}
setup_base ${STAGEDIR}

4
build/distfiles.sh
View File

@ -31,7 +31,9 @@ SELF=distfiles
. ./common.sh
PORTSLIST=$(list_packages ${CONFIGDIR}/aux.conf ${CONFIGDIR}/ports.conf)
if [ -z "${PORTSLIST}" ]; then
PORTSLIST=$(list_packages ${CONFIGDIR}/aux.conf ${CONFIGDIR}/ports.conf)
fi
git_branch ${SRCDIR} ${SRCBRANCH} SRCBRANCH
git_branch ${PORTSDIR} ${PORTSBRANCH} PORTSBRANCH

4
build/options.sh
View File

@ -31,7 +31,9 @@ SELF=options
. ./common.sh
PORTSLIST=$(list_packages ${CONFIGDIR}/aux.conf ${CONFIGDIR}/ports.conf)
if [ -z "${PORTSLIST}" ]; then
PORTSLIST=$(list_packages ${CONFIGDIR}/aux.conf ${CONFIGDIR}/ports.conf)
fi
git_branch ${SRCDIR} ${SRCBRANCH} SRCBRANCH
git_branch ${PORTSDIR} ${PORTSBRANCH} PORTSBRANCH

12
build/plugins.sh
View File

@ -36,14 +36,16 @@ if check_packages ${SELF} ${@}; then
exit 0
fi
PLUGINSCONF=${CONFIGDIR}/plugins.conf
if [ -z "${PLUGINSLIST}" ]; then
PLUGINSCONF=${CONFIGDIR}/plugins.conf
if [ -f ${PLUGINSCONF}.local ]; then
PLUGINSCONF="${PLUGINSCONF} ${PLUGINSCONF}.local"
if [ -f ${PLUGINSCONF}.local ]; then
PLUGINSCONF="${PLUGINSCONF} ${PLUGINSCONF}.local"
fi
PLUGINSLIST=$(list_packages ${PLUGINSCONF})
fi
PLUGINSLIST=$(list_packages ${PLUGINSCONF})
git_branch ${PLUGINSDIR} ${PLUGINSBRANCH} PLUGINSBRANCH
setup_stage ${STAGEDIR}

8
build/ports.sh
View File

@ -56,8 +56,12 @@ if check_packages ${SELF} ${ARGS}; then
exit 0
fi
PORTSLIST=$(list_packages ${CONFIGDIR}/ports.conf)
AUXLIST=$(list_packages ${CONFIGDIR}/aux.conf)
if [ -z "${PORTSLIST}" ]; then
PORTSLIST=$(list_packages ${CONFIGDIR}/ports.conf)
fi
if [ -z "${AUXLIST}" ]; then
AUXLIST=$(list_packages ${CONFIGDIR}/aux.conf)
fi
git_branch ${SRCDIR} ${SRCBRANCH} SRCBRANCH
git_branch ${PORTSDIR} ${PORTSBRANCH} PORTSBRANCH

12
build/test.sh
View File

@ -58,14 +58,16 @@ make -C${COREDIR} ${COREENV} style
make -C${COREDIR} ${COREENV} test
EOF
PLUGINSCONF=${CONFIGDIR}/plugins.conf
if [ -z "${PLUGINSLIST}" ]; then
PLUGINSCONF=${CONFIGDIR}/plugins.conf
if [ -f ${PLUGINSCONF}.local ]; then
PLUGINSCONF="${PLUGINSCONF} ${PLUGINSCONF}.local"
if [ -f ${PLUGINSCONF}.local ]; then
PLUGINSCONF="${PLUGINSCONF} ${PLUGINSCONF}.local"
fi
PLUGINSLIST=$(list_packages ${PLUGINSCONF})
fi
PLUGINSLIST=$(list_packages ${PLUGINSCONF})
for PLUGIN_ORIGIN in ${PLUGINSLIST}; do
VARIANT=${PLUGIN_ORIGIN##*@}
PLUGIN=${PLUGIN_ORIGIN%%@*}