From 51b57320c266c51815a0f8ec9fc3b35fb6dcf72b Mon Sep 17 00:00:00 2001 From: eXtremeSHOK Date: Wed, 14 Feb 2018 17:08:03 +0200 Subject: [PATCH 1/4] Support for alpine linux detects if cp and grep are the non BusyBox versions --- generate_config.sh | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/generate_config.sh b/generate_config.sh index 5b2d23f4..b49a6a21 100755 --- a/generate_config.sh +++ b/generate_config.sh @@ -1,5 +1,14 @@ #!/bin/bash +if grep --help 2>&1 | head -n 1 | grep -q -i "busybox" ; then + echo "BusybBox grep detected, please install gnu grep, \"apk add --upgrade grep\"" + exit 1 +fi +if cp --help 2>&1 | head -n 1 | grep -q -i "busybox" ; then + echo "BusybBox cp detected, please install coreutils, \"apk add --upgrade coreutils\"" + exit 1 +fi + if [[ -f mailcow.conf ]]; then read -r -p "A config file exists and will be overwritten, are you sure you want to contine? [y/N] " response case $response in From 6e91504f6f1fee7e20a9cabaa5e24a670bb65dfb Mon Sep 17 00:00:00 2001 From: eXtremeSHOK Date: Tue, 20 Feb 2018 00:28:59 +0200 Subject: [PATCH 2/4] Update generate_config.sh added --no-cache option, thanks --- generate_config.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/generate_config.sh b/generate_config.sh index b49a6a21..d9a9f7ec 100755 --- a/generate_config.sh +++ b/generate_config.sh @@ -1,11 +1,11 @@ #!/bin/bash if grep --help 2>&1 | head -n 1 | grep -q -i "busybox" ; then - echo "BusybBox grep detected, please install gnu grep, \"apk add --upgrade grep\"" + echo "BusybBox grep detected, please install gnu grep, \"apk add --no-cache --upgrade grep\"" exit 1 fi if cp --help 2>&1 | head -n 1 | grep -q -i "busybox" ; then - echo "BusybBox cp detected, please install coreutils, \"apk add --upgrade coreutils\"" + echo "BusybBox cp detected, please install coreutils, \"apk add --no-cache --upgrade coreutils\"" exit 1 fi From 40885b7fd6f38c3fc5014d402544487e60fca2f1 Mon Sep 17 00:00:00 2001 From: eXtremeSHOK Date: Tue, 20 Feb 2018 00:39:53 +0200 Subject: [PATCH 3/4] Update generate_config.sh exit on error and pipefail minor fix " ; then" to ";then" --- generate_config.sh | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/generate_config.sh b/generate_config.sh index d9a9f7ec..aa600a02 100755 --- a/generate_config.sh +++ b/generate_config.sh @@ -1,10 +1,14 @@ #!/bin/bash -if grep --help 2>&1 | head -n 1 | grep -q -i "busybox" ; then ++#exit on error and pipefail ++set -o errexit ++set -o pipefail + +if grep --help 2>&1 | head -n 1 | grep -q -i "busybox"; then echo "BusybBox grep detected, please install gnu grep, \"apk add --no-cache --upgrade grep\"" exit 1 fi -if cp --help 2>&1 | head -n 1 | grep -q -i "busybox" ; then +if cp --help 2>&1 | head -n 1 | grep -q -i "busybox"; then echo "BusybBox cp detected, please install coreutils, \"apk add --no-cache --upgrade coreutils\"" exit 1 fi From de04016996017a16727ec744f36b2dbce4253686 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andr=C3=A9=20Peters?= Date: Tue, 20 Feb 2018 08:34:49 +0100 Subject: [PATCH 4/4] Update generate_config.sh --- generate_config.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/generate_config.sh b/generate_config.sh index aa600a02..d8cbe8ac 100755 --- a/generate_config.sh +++ b/generate_config.sh @@ -4,11 +4,11 @@ +set -o errexit +set -o pipefail -if grep --help 2>&1 | head -n 1 | grep -q -i "busybox"; then +if grep --help 2>&1 | grep -q -i "busybox"; then echo "BusybBox grep detected, please install gnu grep, \"apk add --no-cache --upgrade grep\"" exit 1 fi -if cp --help 2>&1 | head -n 1 | grep -q -i "busybox"; then +if cp --help 2>&1 | grep -q -i "busybox"; then echo "BusybBox cp detected, please install coreutils, \"apk add --no-cache --upgrade coreutils\"" exit 1 fi