Revert "build/skim: allow override of PORTSLIST too"

This reverts commit 9924449e63.
This commit is contained in:
Franco Fichtner 2022-12-10 14:06:38 +01:00
parent 73da6bb488
commit f96291ce67
2 changed files with 11 additions and 12 deletions

View File

@ -1211,16 +1211,6 @@ ${PLUGINSDIR}
list_config()
{
local LIST_ENV=${1}
shift
if [ -n "${LIST_ENV}" ]; then
for LIST_ORIGIN in ${LIST_ENV}; do
echo ${LIST_ORIGIN}
done
return
fi
cat ${@} | while read LIST_ORIGIN LIST_IGNORE; do
eval LIST_ORIGIN=${LIST_ORIGIN}
if [ "$(echo ${LIST_ORIGIN} | colrm 2)" = "#" ]; then
@ -1242,6 +1232,15 @@ list_config()
list_packages()
{
local LIST_MATCH=1
local LIST_ENV=${1}
shift
if [ -n "${LIST_ENV}" ]; then
for LIST_ORIGIN in ${LIST_ENV}; do
echo ${LIST_ORIGIN}
done
return
fi
list_config ${@}
}

View File

@ -32,8 +32,8 @@ FROM=FreeBSD
. ./common.sh
PORTSLIST=$(list_config "${PORTSLIST}" ${CONFIGDIR}/skim.conf \
${CONFIGDIR}/aux.conf ${CONFIGDIR}/ports.conf)
PORTSLIST=$(list_config ${CONFIGDIR}/skim.conf ${CONFIGDIR}/aux.conf \
${CONFIGDIR}/ports.conf)
DIFF="$(which colordiff 2> /dev/null || echo cat)"
LESS="less -R"