From 22322f5d5f20a744c9408a6ec6fe97dca8588ae9 Mon Sep 17 00:00:00 2001 From: bilogic <946010+bilogic@users.noreply.github.com> Date: Sun, 21 Apr 2024 17:01:52 +0800 Subject: [PATCH] auto formatting, no change in logic --- setup/start.sh | 48 ++++++++++++++++++++++++------------------------ 1 file changed, 24 insertions(+), 24 deletions(-) diff --git a/setup/start.sh b/setup/start.sh index dbf1c16c..995e1ac6 100755 --- a/setup/start.sh +++ b/setup/start.sh @@ -14,9 +14,9 @@ source setup/preflight.sh # Python may not be able to read/write files. This is also # in the management daemon startup script and the cron script. -if ! locale -a | grep en_US.utf8 > /dev/null; then - # Generate locale if not exists - hide_output locale-gen en_US.UTF-8 +if ! locale -a | grep en_US.utf8 >/dev/null; then + # Generate locale if not exists + hide_output locale-gen en_US.UTF-8 fi export LANGUAGE=en_US.UTF-8 @@ -35,7 +35,7 @@ if [ -f /etc/mailinabox.conf ]; then # Load the old .conf file to get existing configuration options loaded # into variables with a DEFAULT_ prefix. - cat /etc/mailinabox.conf | sed s/^/DEFAULT_/ > /tmp/mailinabox.prev.conf + cat /etc/mailinabox.conf | sed s/^/DEFAULT_/ >/tmp/mailinabox.prev.conf source /tmp/mailinabox.prev.conf rm -f /tmp/mailinabox.prev.conf else @@ -44,7 +44,7 @@ fi # Put a start script in a global location. We tell the user to run 'mailinabox' # in the first dialog prompt, so we should do this before that starts. -cat > /usr/local/bin/mailinabox << EOF; +cat >/usr/local/bin/mailinabox < "$STORAGE_ROOT/mailinabox.version" + setup/migrate.py --current >"$STORAGE_ROOT/mailinabox.version" chown "$STORAGE_USER:$STORAGE_USER" "$STORAGE_ROOT/mailinabox.version" fi @@ -92,7 +95,7 @@ fi # tools know where to look for data. The default MTA_STS_MODE setting # is blank unless set by an environment variable, but see web.sh for # how that is interpreted. -cat > /etc/mailinabox.conf << EOF; +cat >/etc/mailinabox.conf <