Squashed commit of the following:
commit 94c1a6c4e1
Author: DerLinkman <niklas.meyer@servercow.de>
Date: Wed Sep 10 16:20:58 2025 +0200
scripts: ipv6_controller improvement + fix modules handling (#6722)
* Fix subscript handling for modules
* ipv6: detect case when link local is present
* v6-controller: removed fixed-cidr for docker 28+
This commit is contained in:
@@ -3,6 +3,20 @@
|
||||
############## Begin Function Section ##############
|
||||
|
||||
SCRIPT_DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
|
||||
MAILCOW_CONF="${SCRIPT_DIR}/mailcow.conf"
|
||||
|
||||
# Ensure the script is run from the directory that contains mailcow.conf
|
||||
if [ ! -f "${PWD}/mailcow.conf" ]; then
|
||||
if [ -f "${SCRIPT_DIR}/mailcow.conf" ]; then
|
||||
echo -e "\e[33mPlease run this script directly from the mailcow installation directory:\e[0m"
|
||||
echo -e " \e[36mcd ${SCRIPT_DIR} && ./update.sh\e[0m"
|
||||
exit 1
|
||||
else
|
||||
echo -e "\e[31mmailcow.conf not found in current directory or script directory (\e[36m${SCRIPT_DIR}\e[31m).\e[0m"
|
||||
echo -e "\e[33mRun this script directly from your mailcow installation directory.\e[0m"
|
||||
exit 1
|
||||
fi
|
||||
fi
|
||||
BRANCH="$(cd "${SCRIPT_DIR}" && git rev-parse --abbrev-ref HEAD)"
|
||||
|
||||
MODULE_DIR="${SCRIPT_DIR}/_modules"
|
||||
@@ -27,8 +41,6 @@ if [ "$(id -u)" -ne "0" ]; then
|
||||
exit 1
|
||||
fi
|
||||
|
||||
SCRIPT_DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
|
||||
|
||||
# Run pre-update-hook
|
||||
if [ -f "${SCRIPT_DIR}/pre_update_hook.sh" ]; then
|
||||
bash "${SCRIPT_DIR}/pre_update_hook.sh"
|
||||
|
||||
Reference in New Issue
Block a user