From 045821e585cfa27cb967c27b1e3502598fa468d8 Mon Sep 17 00:00:00 2001 From: AiutoPcAmico Date: Thu, 28 Dec 2023 16:49:06 +0100 Subject: [PATCH] Started porting in version 67 --- .vscode/settings.json | 6 +++ management/status_checks.py | 8 ++-- setup/bootstrap.sh | 92 ------------------------------------- 3 files changed, 10 insertions(+), 96 deletions(-) create mode 100644 .vscode/settings.json delete mode 100644 setup/bootstrap.sh diff --git a/.vscode/settings.json b/.vscode/settings.json new file mode 100644 index 00000000..cee7b74a --- /dev/null +++ b/.vscode/settings.json @@ -0,0 +1,6 @@ +{ + "[python]": { + "editor.defaultFormatter": "ms-python.black-formatter" + }, + "python.formatting.provider": "none" +} diff --git a/management/status_checks.py b/management/status_checks.py index 7ef27350..c1176c05 100755 --- a/management/status_checks.py +++ b/management/status_checks.py @@ -915,7 +915,7 @@ def what_version_is_this(env): # This function runs `git describe --always --abbrev=0` on the Mail-in-a-Box installation directory. # Git may not be installed and Mail-in-a-Box may not have been cloned from github, # so this function may raise all sorts of exceptions. - return "V65-AiutoPcAmico" + return "V67-AiutoPcAmico" def get_latest_miab_version(): # This pings https://mailinabox.email/setup.sh and extracts the tag named in @@ -941,12 +941,12 @@ def check_miab_version(env, output): else: latest_ver = get_latest_miab_version() - if this_ver == latest_ver: - output.print_ok("Mail-in-a-Box is up to date. You are running version %s." % this_ver) + if this_ver == latest_ver + "-AiutoPcAmico": + output.print_ok("AiutoPcAmico version of Mail-in-a-Box is up to date. You are running version %s." % this_ver) elif latest_ver is None: output.print_error("Latest Mail-in-a-Box version could not be determined. You are running version %s." % this_ver) else: - output.print_error("A new version of Mail-in-a-Box is available. You are running version %s. The latest version is %s. For upgrade instructions, see https://mailinabox.email. " + output.print_error("A new version of the original Mail-in-a-Box is available. You are running version %s. The latest version is %s. For upgrade instructions, check last push on AiutoPcAmico debian-mailinabox fork. " % (this_ver, latest_ver)) def run_and_output_changes(env, pool): diff --git a/setup/bootstrap.sh b/setup/bootstrap.sh deleted file mode 100644 index d3bd6fac..00000000 --- a/setup/bootstrap.sh +++ /dev/null @@ -1,92 +0,0 @@ -#!/bin/bash -######################################################### -# This script is intended to be run like this: -# -# curl https://mailinabox.email/setup.sh | sudo bash -# -######################################################### - -if [ -z "$TAG" ]; then - # If a version to install isn't explicitly given as an environment - # variable, then install the latest version. But the latest version - # depends on the machine's version of Ubuntu. Existing users need to - # be able to upgrade to the latest version available for that version - # of Ubuntu to satisfy the migration requirements. - # - # Also, the system status checks read this script for TAG = (without the - # space, but if we put it in a comment it would confuse the status checks!) - # to get the latest version, so the first such line must be the one that we - # want to display in status checks. - # - # Allow point-release versions of the major releases, e.g. 22.04.1 is OK. - UBUNTU_VERSION=$( lsb_release -d | sed 's/.*:\s*//' | sed 's/\([0-9]*\.[0-9]*\)\.[0-9]/\1/' ) - if [ "$UBUNTU_VERSION" == "Ubuntu 22.04 LTS" ]; then - # This machine is running Ubuntu 22.04, which is supported by - # Mail-in-a-Box versions 60 and later. - TAG=v65 - elif [ "$UBUNTU_VERSION" == "Ubuntu 18.04 LTS" ]; then - # This machine is running Ubuntu 18.04, which is supported by - # Mail-in-a-Box versions 0.40 through 5x. - echo "Support is ending for Ubuntu 18.04." - echo "Please immediately begin to migrate your data to" - echo "a new machine running Ubuntu 22.04. See:" - echo "https://mailinabox.email/maintenance.html#upgrade" - TAG=v57a - elif [ "$UBUNTU_VERSION" == "Ubuntu 14.04 LTS" ]; then - # This machine is running Ubuntu 14.04, which is supported by - # Mail-in-a-Box versions 1 through v0.30. - echo "Ubuntu 14.04 is no longer supported." - echo "The last version of Mail-in-a-Box supporting Ubuntu 14.04 will be installed." - TAG=v0.30 - else - echo "This script may be used only on a machine running Ubuntu 14.04, 18.04, or 22.04." - exit 1 - fi -fi - -# Are we running as root? -if [[ $EUID -ne 0 ]]; then - echo "This script must be run as root. Did you leave out sudo?" - exit 1 -fi - -# Clone the Mail-in-a-Box repository if it doesn't exist. -if [ ! -d $HOME/mailinabox ]; then - if [ ! -f /usr/bin/git ]; then - echo Installing git . . . - apt-get -q -q update - DEBIAN_FRONTEND=noninteractive apt-get -q -q install -y git < /dev/null - echo - fi - - if [ "$SOURCE" == "" ]; then - SOURCE=https://github.com/mail-in-a-box/mailinabox - fi - - echo Downloading Mail-in-a-Box $TAG. . . - git clone \ - -b $TAG --depth 1 \ - $SOURCE \ - $HOME/mailinabox \ - < /dev/null 2> /dev/null - - echo -fi - -# Change directory to it. -cd $HOME/mailinabox - -# Update it. -if [ "$TAG" != $(git describe --always) ]; then - echo Updating Mail-in-a-Box to $TAG . . . - git fetch --depth 1 --force --prune origin tag $TAG - if ! git checkout -q $TAG; then - echo "Update failed. Did you modify something in $(pwd)?" - exit 1 - fi - echo -fi - -# Start setup script. -setup/start.sh -