diff --git a/build/common.sh b/build/common.sh index 4d90260..b86cb5b 100644 --- a/build/common.sh +++ b/build/common.sh @@ -1211,16 +1211,6 @@ ${PLUGINSDIR} list_config() { - eval LIST_ENV="\${${1}LIST}" - 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 @@ -1243,12 +1233,12 @@ list_ports() { local LIST_MATCH=1 - list_config PORTS ${@} + list_config ${@} } list_plugins() { local LIST_MATCH=1 - list_config PLUGINS ${@} + list_config ${@} } diff --git a/build/skim.sh b/build/skim.sh index 2184b27..8842438 100644 --- a/build/skim.sh +++ b/build/skim.sh @@ -32,7 +32,7 @@ FROM=FreeBSD . ./common.sh -PORTSLIST=$(list_config PORTS ${CONFIGDIR}/skim.conf ${CONFIGDIR}/aux.conf \ +PORTSLIST=$(list_config ${CONFIGDIR}/skim.conf ${CONFIGDIR}/aux.conf \ ${CONFIGDIR}/ports.conf) DIFF="$(which colordiff 2> /dev/null || echo cat)"