github-com-docker-mailserver/docker-mailserver
1
0
Fork 0
mirror of https://github.com/docker-mailserver/docker-mailserver.git synced 2024-01-19 02:48:50 +00:00
Code Issues Projects Releases Wiki Activity

adjusting Bash failure-construct & SCRIPT variable usage

Browse source
This commit is contained in:
Georg Lauterbach 2020-12-22 18:09:03 +01:00
parent 2020df88fe
commit 6b03c3add5
No known key found for this signature in database
GPG key ID: 2FDC58699AF121C6
2 changed files with 7 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
CONTRIBUTING.md
View file

@ -125,12 +125,12 @@ A construct to trace error in your scripts looks like this. Remember: Remove `se
set -xeuEo pipefail set -xeuEo pipefail
trap '__log_err ${FUNCNAME[0]:-"?"} ${_:-"?"} ${LINENO:-"?"} ${?:-"?"}' ERR trap '__log_err ${FUNCNAME[0]:-"?"} ${_:-"?"} ${LINENO:-"?"} ${?:-"?"}' ERR
SCRIPT='NAME OF THIS SCRIPT' SCRIPT='name_of_this_script.sh'
function __log_err function __log_err
{ {
printf "\n––– \e[1m\e[31mUNCHECKED ERROR\e[0m\n%s\n%s\n%s\n%s\n\n" \ printf "\n––– \e[1m\e[31mUNCHECKED ERROR\e[0m\n%s\n%s\n%s\n%s\n\n" \
" – script = ${SCRIPT:-'unknown'}" \ " – script = ${SCRIPT:-${0}}" \
" – function = ${1} / ${2}" \ " – function = ${1} / ${2}" \
" – line = ${3}" \ " – line = ${3}" \
" – exit code = ${4}" 1>&2 " – exit code = ${4}" 1>&2

10
setup.sh
View file

@ -3,7 +3,7 @@
# Wrapper for various setup scripts # Wrapper for various setup scripts
# included in docker-mailserver # included in docker-mailserver
SCRIPT='SETUP' SCRIPT='setup.sh'
set -euEo pipefail set -euEo pipefail
trap '__log_err ${FUNCNAME[0]:-"?"} ${_:-"?"} ${LINENO:-"?"} ${?:-"?"}' ERR trap '__log_err ${FUNCNAME[0]:-"?"} ${_:-"?"} ${LINENO:-"?"} ${?:-"?"}' ERR
@ -17,10 +17,10 @@ function __log_err
EXIT_CODE="${4}" EXIT_CODE="${4}"
printf "\n––– \e[1m\e[31mUNCHECKED ERROR\e[0m\n%s\n%s\n%s\n%s\n\n" \ printf "\n––– \e[1m\e[31mUNCHECKED ERROR\e[0m\n%s\n%s\n%s\n%s\n\n" \
" – script = ${SCRIPT,,}.sh" \ " – script = ${SCRIPT:-${0}}" \
" – function = ${FUNC_NAME}" \ " – function = ${FUNC_NAME}" \
" – line = ${LINE}" \ " – line = ${LINE}" \
" – exit code = ${EXIT_CODE}" " – exit code = ${EXIT_CODE}" 1>&2
} }
function _unset_vars function _unset_vars
@ -34,7 +34,7 @@ function _get_current_directory
{ {
if dirname "$(readlink -f "${0}")" &>/dev/null if dirname "$(readlink -f "${0}")" &>/dev/null
then then
CDIR="$(cd "$(dirname "$(readlink -f "${0}")")" && pwd)" CDIR="$(dirname "$(readlink -f "${0}")")"
elif realpath -e -L "${0}" &>/dev/null elif realpath -e -L "${0}" &>/dev/null
then then
CDIR="$(realpath -e -L "${0}")" CDIR="$(realpath -e -L "${0}")"
@ -101,7 +101,7 @@ function _inspect
function _usage function _usage
{ {
echo "${SCRIPT,,}.sh Bootstrapping Script echo "${SCRIPT:-${0}} Bootstrapping Script
Usage: ${0} [-i IMAGE_NAME] [-c CONTAINER_NAME] <subcommand> <subcommand> [args] Usage: ${0} [-i IMAGE_NAME] [-c CONTAINER_NAME] <subcommand> <subcommand> [args]