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

build: list_ports/list_plugins are the same, use shared list_packages

This commit is contained in:
Franco Fichtner 2022-08-31 12:43:36 +02:00
parent 968e273e06
commit e31fbaa3fd
7 changed files with 8 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
build/audit.sh
View File

@ -31,7 +31,7 @@ SELF=audit
. ./common.sh
PORTSLIST=$(list_ports ${CONFIGDIR}/ports.conf)
PORTSLIST=$(list_packages ${CONFIGDIR}/ports.conf)
setup_stage ${STAGEDIR}
setup_base ${STAGEDIR}

9
build/common.sh
View File

@ -1229,14 +1229,7 @@ list_config()
done
}
list_ports()
{
local LIST_MATCH=1
list_config ${@}
}
list_plugins()
list_packages()
{
local LIST_MATCH=1

2
build/distfiles.sh
View File

@ -31,7 +31,7 @@ SELF=distfiles
. ./common.sh
PORTSLIST=$(list_ports ${CONFIGDIR}/aux.conf ${CONFIGDIR}/ports.conf)
PORTSLIST=$(list_packages ${CONFIGDIR}/aux.conf ${CONFIGDIR}/ports.conf)
git_branch ${SRCDIR} ${SRCBRANCH} SRCBRANCH
git_branch ${PORTSDIR} ${PORTSBRANCH} PORTSBRANCH

2
build/options.sh
View File

@ -31,7 +31,7 @@ SELF=options
. ./common.sh
PORTSLIST=$(list_ports ${CONFIGDIR}/aux.conf ${CONFIGDIR}/ports.conf)
PORTSLIST=$(list_packages ${CONFIGDIR}/aux.conf ${CONFIGDIR}/ports.conf)
git_branch ${SRCDIR} ${SRCBRANCH} SRCBRANCH
git_branch ${PORTSDIR} ${PORTSBRANCH} PORTSBRANCH

2
build/plugins.sh
View File

@ -42,7 +42,7 @@ if [ -f ${PLUGINSCONF}.local ]; then
PLUGINSCONF="${PLUGINSCONF} ${PLUGINSCONF}.local"
fi
PLUGINSLIST=$(list_plugins ${PLUGINSCONF})
PLUGINSLIST=$(list_packages ${PLUGINSCONF})
git_branch ${PLUGINSDIR} ${PLUGINSBRANCH} PLUGINSBRANCH

4
build/ports.sh
View File

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

2
build/test.sh
View File

@ -64,7 +64,7 @@ if [ -f ${PLUGINSCONF}.local ]; then
PLUGINSCONF="${PLUGINSCONF} ${PLUGINSCONF}.local"
fi
PLUGINSLIST=$(list_plugins ${PLUGINSCONF})
PLUGINSLIST=$(list_packages ${PLUGINSCONF})
for PLUGIN_ORIGIN in ${PLUGINSLIST}; do
VARIANT=${PLUGIN_ORIGIN##*@}