1
0
mirror of https://github.com/mail-in-a-box/mailinabox.git synced 2026-03-20 18:27:23 +01:00

Merge branch 'master' into jammyjellyfish2204

# Conflicts:
#	setup/management.sh
#	setup/mods.available/connect-nextcloud-to-miab.sh
#	setup/start.sh
#	setup/webmail.sh
#	tests/lib/carddav.sh
#	tests/lib/system.sh
#	tests/system-setup/setup-defaults.sh
#	tests/system-setup/setup-funcs.sh
#	tests/system-setup/upgrade.sh
This commit is contained in:
downtownallday
2022-09-05 10:17:17 -04:00
20 changed files with 494 additions and 17 deletions

View File

@@ -168,7 +168,9 @@ fi
if [ -d "${LOCAL_MODS_DIR:-local}" ]; then
for mod in $(ls "${LOCAL_MODS_DIR:-local}" | grep -v '~$'); do
if [ -x ${LOCAL_MODS_DIR:-local}/$mod ]; then
${LOCAL_MODS_DIR:-local}/$mod |& sed -e "s/^/mod(${mod%%.*}): /"
echo ""
echo "Running mod: ${LOCAL_MODS_DIR:-local}/$mod"
${LOCAL_MODS_DIR:-local}/$mod
fi
done
fi