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

build/plugins: add list_plugins for #262

This commit is contained in:
Franco Fichtner 2022-01-12 12:16:08 +01:00
parent 86a772fefe
commit 1f85cfffca
2 changed files with 35 additions and 35 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
build/common.sh
View File

@ -1,6 +1,6 @@
#!/bin/sh
# Copyright (c) 2014-2021 Franco Fichtner <franco@opnsense.org>
# Copyright (c) 2014-2022 Franco Fichtner <franco@opnsense.org>
# Copyright (c) 2010-2011 Scott Ullrich <sullrich@gmail.com>
#
# Redistribution and use in source and binary forms, with or without
@ -1222,8 +1222,6 @@ list_ports()
shift
fi
local PORT_CONFIGS=${@}
if [ -n "${PORTSLIST}" ]; then
for PORT_ORIGIN in ${PORTSLIST}; do
echo ${PORT_ORIGIN}
@ -1231,7 +1229,7 @@ list_ports()
return
fi
cat ${PORT_CONFIGS} | while read PORT_ORIGIN PORT_IGNORE; do
cat ${@} | while read PORT_ORIGIN PORT_IGNORE; do
eval PORT_ORIGIN=${PORT_ORIGIN}
if [ "$(echo ${PORT_ORIGIN} | colrm 2)" = "#" ]; then
continue
@ -1248,3 +1246,29 @@ list_ports()
echo ${PORT_ORIGIN}
done
}
list_plugins()
{
if [ -n "${PLUGINSLIST}" ]; then
for PLUGIN_ORIGIN in ${PLUGINSLIST}; do
echo ${PLUGIN_ORIGIN}
done
return
fi
cat ${@} | while read PLUGIN_ORIGIN PLUGIN_IGNORE; do
if [ "$(echo ${PLUGIN_ORIGIN} | colrm 2)" = "#" ]; then
continue
fi
if [ -n "${PLUGIN_IGNORE}" ]; then
for PLUGIN_QUIRK in $(echo ${PLUGIN_IGNORE} | tr ',' ' '); do
if [ ${PLUGIN_QUIRK} = ${PRODUCT_TARGET} -o \
${PLUGIN_QUIRK} = ${PRODUCT_ARCH} -o \
${PLUGIN_QUIRK} = ${PRODUCT_FLAVOUR} ]; then
continue 2
fi
done
fi
echo ${PLUGIN_ORIGIN}
done
}

38
build/plugins.sh
View File

@ -1,6 +1,6 @@
#!/bin/sh
# Copyright (c) 2015-2021 Franco Fichtner <franco@opnsense.org>
# Copyright (c) 2015-2022 Franco Fichtner <franco@opnsense.org>
#
# Redistribution and use in source and binary forms, with or without
# modification, are permitted provided that the following conditions
@ -31,42 +31,18 @@ SELF=plugins
. ./common.sh
if check_packages ${SELF} ${@}; then
echo ">>> Step ${SELF} is up to date"
exit 0
fi
PLUGINSCONF=${CONFIGDIR}/plugins.conf
if [ -f ${PLUGINSCONF}.local ]; then
PLUGINSCONF="${PLUGINSCONF} ${PLUGINSCONF}.local"
fi
if [ -z "${PLUGINSLIST}" ]; then
PLUGINSLIST=$(
cat ${PLUGINSCONF} | while read PLUGIN_ORIGIN PLUGIN_IGNORE; do
if [ "$(echo ${PLUGIN_ORIGIN} | colrm 2)" = "#" ]; then
continue
fi
if [ -n "${PLUGIN_IGNORE}" ]; then
for PLUGIN_QUIRK in $(echo ${PLUGIN_IGNORE} | tr ',' ' '); do
if [ ${PLUGIN_QUIRK} = ${PRODUCT_TARGET} -o \
${PLUGIN_QUIRK} = ${PRODUCT_ARCH} -o \
${PLUGIN_QUIRK} = ${PRODUCT_FLAVOUR} ]; then
continue 2
fi
done
fi
echo ${PLUGIN_ORIGIN}
done
)
else
PLUGINSLIST=$(
for PLUGIN_ORIGIN in ${PLUGINSLIST}; do
echo ${PLUGIN_ORIGIN}
done
)
fi
if check_packages ${SELF} ${@}; then
echo ">>> Step ${SELF} is up to date"
exit 0
fi
PLUGINSLIST=$(list_plugins ${PLUGINSCONF})
git_branch ${PLUGINSDIR} ${PLUGINSBRANCH} PLUGINSBRANCH