From d98825f609bb96aae79aa5f8524c8e9af541742d Mon Sep 17 00:00:00 2001 From: David Duque Date: Mon, 20 Apr 2020 23:31:18 +0100 Subject: [PATCH] Update pre-flights, bump version --- README.md | 4 ++-- setup/bootstrap.sh | 27 ++++++++++----------------- setup/preflight.sh | 4 ++-- 3 files changed, 14 insertions(+), 21 deletions(-) diff --git a/README.md b/README.md index 79e32829..26902138 100644 --- a/README.md +++ b/README.md @@ -1,7 +1,7 @@ (Power) Mail-in-a-Box ===================== -## Current Version: v0.44.POWER.1 (Tracking v0.44) +## Current Version: v0.44.POWER.2 (Tracking v0.44) This is a fork of MiaB (duh), hacked and tuned to my needs: @@ -19,7 +19,7 @@ This is a fork of MiaB (duh), hacked and tuned to my needs: - ✅ Bumped the bootstrap and jQuery dependencies' versions - and we've got a brand new admin panel now! -- 👨‍💻 Per-domain `nginx` configuration support. This will allow you to: +- ✅ Per-domain `nginx` configuration support. This will allow you to: - - Use PHP (e.g. host a domain shortener); diff --git a/setup/bootstrap.sh b/setup/bootstrap.sh index db596798..51edd61e 100644 --- a/setup/bootstrap.sh +++ b/setup/bootstrap.sh @@ -2,7 +2,7 @@ ######################################################### # This script is intended to be run like this: # -# curl https://mailinabox.email/setup.sh | sudo bash +# curl https://dvn.pt/power-miab | sudo bash # ######################################################### @@ -18,23 +18,12 @@ if [ -z "$TAG" ]; then # 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. - if [ "`lsb_release -d | sed 's/.*:\s*//' | sed 's/18\.04\.[0-9]/18.04/' `" == "Ubuntu 18.04 LTS" ]; then + if [ "`lsb_release -d | sed 's/.*:\s*//' `" == "Debian GNU/Linux 10 (buster)" ]; then # This machine is running Ubuntu 18.04. - TAG=v0.44 - - elif [ "`lsb_release -d | sed 's/.*:\s*//' | sed 's/14\.04\.[0-9]/14.04/' `" == "Ubuntu 14.04 LTS" ]; then - # This machine is running Ubuntu 14.04. - echo "You are installing the last version of Mail-in-a-Box that will" - echo "support Ubuntu 14.04. If this is a new installation of Mail-in-a-Box," - echo "stop now and switch to a machine running Ubuntu 18.04. If you are" - echo "upgrading an existing Mail-in-a-Box --- great. After upgrading this" - echo "box, please visit https://mailinabox.email for notes on how to upgrade" - echo "to Ubuntu 18.04." - echo "" - TAG=v0.30 + TAG=v0.44.POWER.2 else - echo "This script must be run on a system running Ubuntu 18.04 or Ubuntu 14.04." + echo "This script must be run on a system running Debian 10." exit 1 fi fi @@ -50,14 +39,18 @@ 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 + DEBIAN_FRONTEND=noninteractive apt-get -q -q install -y git locales < /dev/null echo fi + echo Setting locales . . . + locale-gen en_US.UTF-8 + echo "LANG=en_US.UTF-8" > /etc/default/locale + echo Downloading Mail-in-a-Box $TAG. . . git clone \ -b $TAG --depth 1 \ - https://github.com/mail-in-a-box/mailinabox \ + https://github.com/ddavness/power-mailinabox \ $HOME/mailinabox \ < /dev/null 2> /dev/null diff --git a/setup/preflight.sh b/setup/preflight.sh index 66cabb0c..8e3fbdd7 100644 --- a/setup/preflight.sh +++ b/setup/preflight.sh @@ -8,8 +8,8 @@ if [[ $EUID -ne 0 ]]; then fi # Check that we are running on Debian GNU/Linux -if [ "`lsb_release -d | sed 's/.*:\s*//' | sed -r 's/ [[:digit:]]+ (.*)//' `" != "Debian GNU/Linux" ]; then - echo "Mail-in-a-Box only supports being installed on Debian (ideally, 10 or later), sorry. You are running:" +if [ "`lsb_release -d | sed 's/.*:\s*//' `" != "Debian GNU/Linux 10 (buster)" ]; then + echo "Mail-in-a-Box only supports being installed on Debian 10, sorry. You are running:" echo lsb_release -d | sed 's/.*:\s*//' echo