upstream/opnsense-tools
1
0
Fork 0
mirror of https://github.com/opnsense/tools.git synced 2026-06-09 00:33:48 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

build: fix PORTS_LIST / PLUGINS_LIST usage

Browse source
This commit is contained in:
Franco Fichtner 2017-10-17 17:18:40 +02:00
parent 77af502e5f
commit 71fe06f98c
4 changed files with 36 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
build/distfiles.sh
View file

@ -31,7 +31,8 @@ SELF=distfiles
. ./common.sh
[ -z ${PORTS_LIST} ] && PORTS_LIST=$(
if [ -z "${PORTS_LIST}" ]; then
PORTS_LIST=$(
cat ${CONFIGDIR}/skim.conf ${CONFIGDIR}/ports.conf | \
while read PORT_ORIGIN PORT_IGNORE; do
if [ "$(echo ${PORT_ORIGIN} | colrm 2)" = "#" ]; then
@ -48,6 +49,13 @@ cat ${CONFIGDIR}/skim.conf ${CONFIGDIR}/ports.conf | \
echo ${PORT_ORIGIN}
done
)
else
PORTS_LIST=$(
for PORT_ORIGIN in ${PORTS_LIST}; do
echo ${PORT_ORIGIN}
done
)
fi
git_branch ${SRCDIR} ${SRCBRANCH} SRCBRANCH
git_branch ${PORTSDIR} ${PORTSBRANCH} PORTSBRANCH

10
build/plugins.sh
View file

@ -31,7 +31,8 @@ SELF=plugins
. ./common.sh
[ -z ${PLUGINS_LIST} ] && PLUGINS_LIST=$(
if [ -z "${PLUGINS_LIST}" ]; then
PLUGINS_LIST=$(
cat ${CONFIGDIR}/plugins.conf | while read PLUGIN_ORIGIN PLUGIN_IGNORE; do
if [ "$(echo ${PLUGIN_ORIGIN} | colrm 2)" = "#" ]; then
continue
@ -57,6 +58,13 @@ cat ${CONFIGDIR}/plugins.conf | while read PLUGIN_ORIGIN PLUGIN_IGNORE; do
echo ${PLUGIN_ORIGIN}
done
)
else
PLUGINS_LIST=$(
for PLUGIN_ORIGIN in ${PLUGIN_LIST}; do
echo ${PLUGIN_ORIGIN}
done
)
fi
check_packages ${SELF} ${@}

10
build/ports.sh
View file

@ -31,7 +31,8 @@ SELF=ports
. ./common.sh
[ -z ${PORTS_LIST} ] && PORTS_LIST=$(
if [ -z "${PORTS_LIST}" ]; then
PORTS_LIST=$(
cat ${CONFIGDIR}/ports.conf | while read PORT_ORIGIN PORT_IGNORE; do
if [ "$(echo ${PORT_ORIGIN} | colrm 2)" = "#" ]; then
continue
@ -57,6 +58,13 @@ cat ${CONFIGDIR}/ports.conf | while read PORT_ORIGIN PORT_IGNORE; do
echo ${PORT_ORIGIN}
done
)
else
PORTS_LIST=$(
for PORT_ORIGIN in ${PORTS_LIST}; do
echo ${PORT_ORIGIN}
done
)
fi
check_packages ${SELF} ${@}

10
build/skim.sh
View file

@ -35,7 +35,8 @@ setup_stage ${STAGEDIR}
MAKE_ARGS="__MAKE_CONF=${CONFIGDIR}/make.conf PRODUCT_FLAVOUR=${PRODUCT_FLAVOUR}"
[ -z ${PORTS_LIST} ] && PORTS_LIST=$(
if [ -z "${PORTS_LIST}" ]; then
PORTS_LIST=$(
cat ${CONFIGDIR}/skim.conf ${CONFIGDIR}/ports.conf | \
while read PORT_ORIGIN PORT_IGNORE; do
if [ "$(echo ${PORT_ORIGIN} | colrm 2)" = "#" ]; then
@ -44,6 +45,13 @@ cat ${CONFIGDIR}/skim.conf ${CONFIGDIR}/ports.conf | \
echo ${PORT_ORIGIN}
done
)
else
PORTS_LIST=$(
for PORT_ORIGIN in ${PORTS_LIST}; do
echo ${PORT_ORIGIN}
done
)
fi
DIFF="$(which colordiff 2> /dev/null || echo cat)"
LESS="less -R"