external/mailinabox
1
0
Fork 0
mirror of https://github.com/mail-in-a-box/mailinabox.git synced 2026-09-17 01:07:59 +02:00
Code Issues Releases Wiki Activity

Merge branch 'master' into jammyjellyfish2204

Browse Source 
# 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:30:45 -04:00
parent 549fdbf97a f6cd8f56c3
commit f63488aa1a
20 changed files with 494 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files
setup/start.sh
+3 -1
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