diff --git a/.gitignore b/.gitignore index b4e4712..b83ae65 100644 --- a/.gitignore +++ b/.gitignore @@ -1,3 +1,4 @@ /config/*/build.conf.local +/config/*/plugins.conf.local /config/*/repo.key /config/*/repo.pub diff --git a/build/plugins.sh b/build/plugins.sh index b413bd0..989b9f4 100644 --- a/build/plugins.sh +++ b/build/plugins.sh @@ -31,9 +31,15 @@ SELF=plugins . ./common.sh +PLUGINS_CONF=${CONFIGDIR}/plugins.conf + +if [ -f ${PLUGINS_CONF}.local ]; then + PLUGINS_CONF="${PLUGINS_CONF} ${PLUGINS_CONF}.local" +fi + if [ -z "${PLUGINS_LIST}" ]; then PLUGINS_LIST=$( -cat ${CONFIGDIR}/plugins.conf | while read PLUGIN_ORIGIN PLUGIN_IGNORE; do +cat ${PLUGINS_CONF} | while read PLUGIN_ORIGIN PLUGIN_IGNORE; do if [ "$(echo ${PLUGIN_ORIGIN} | colrm 2)" = "#" ]; then continue fi