Skip to content

Fix shellcheck warnings #1

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
am-on wants to merge 1 commit into
base: main
Choose a base branch
from
Open

Fix shellcheck warnings #1

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
58 changes: 30 additions & 28 deletions backup.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,19 +1,21 @@
#!/bin/bash

###############################
# #
# Mailcow Borg Backup #
# #
###############################
# Author: Matthis B. #
# Created: 20201105 #
# Lastchange: 20201119 #
###############################
# Changelog: #
# - 20201105: init #
# - 20201107: small changes #
# - 20201119: bug fixes #
###############################
########################################
# #
# Mailcow Borg Restore #
# #
########################################
# Author: Matthis B. #
# Created: 20201105 #
# Lastchange: 20201129 #
########################################
# Changelog: #
# - 20201106: init #
# - 20201107: small changes #
# - 20201119: bug fixes #
# - 20201129: fix shellcheck warnings #
########################################


##
## Cronjob:
Expand All @@ -23,9 +25,9 @@
#
# Functions
#
getDate() { echo $(date +'%d.%m.%Y %H:%M:%S'); }
getDate() { date +'%d.%m.%Y %H:%M:%S'; }
info() { printf "\n- %s %s\n\n" "$( getDate )" "$*" >&2; }
trap "echo $( getDate ) Backup interrupted >&2; exit 2" INT TERM
trap 'echo "$( getDate )" Backup interrupted >&2; exit 2' INT TERM


#
Expand All @@ -51,14 +53,14 @@ export BORG_RELOCATED_REPO_ACCESS_IS_OK=yes

# autocatch vars
source "${workDirectory}/mailcow.conf"
CMPS_PRJ=$(echo $COMPOSE_PROJECT_NAME | tr -cd "[A-Za-z-_]")
CMPS_PRJ=$(echo "$COMPOSE_PROJECT_NAME" | tr -cd "A-Za-z-_")

volumeVMail=$(docker volume inspect -f '{{ .Mountpoint }}' ${CMPS_PRJ}_vmail-vol-1)
volumeCrypt=$(docker volume inspect -f '{{ .Mountpoint }}' ${CMPS_PRJ}_crypt-vol-1)
volumeRedis=$(docker volume inspect -f '{{ .Mountpoint }}' ${CMPS_PRJ}_redis-vol-1)
volumeRSpamd=$(docker volume inspect -f '{{ .Mountpoint }}' ${CMPS_PRJ}_rspamd-vol-1)
volumePostfix=$(docker volume inspect -f '{{ .Mountpoint }}' ${CMPS_PRJ}_postfix-vol-1)
volumeMySQL=$(docker volume inspect -f '{{ .Mountpoint }}' ${CMPS_PRJ}_mysql-vol-1)
volumeVMail=$(docker volume inspect -f '{{ .Mountpoint }}' "${CMPS_PRJ}"_vmail-vol-1)
volumeCrypt=$(docker volume inspect -f '{{ .Mountpoint }}' "${CMPS_PRJ}"_crypt-vol-1)
volumeRedis=$(docker volume inspect -f '{{ .Mountpoint }}' "${CMPS_PRJ}"_redis-vol-1)
volumeRSpamd=$(docker volume inspect -f '{{ .Mountpoint }}' "${CMPS_PRJ}"_rspamd-vol-1)
volumePostfix=$(docker volume inspect -f '{{ .Mountpoint }}' "${CMPS_PRJ}"_postfix-vol-1)
volumeMySQL=$(docker volume inspect -f '{{ .Mountpoint }}' "${CMPS_PRJ}"_mysql-vol-1)



Expand Down Expand Up @@ -147,7 +149,7 @@ if [[ -d "${volumeMySQL}/tmp_backup" ]] ; then
fi
fi
mysql_id=$(docker ps -qf 'name=mysql-mailcow')
docker exec ${mysql_id} /bin/sh -c "mariabackup --host mysql --user root --password ${DBROOT} \
docker exec "${mysql_id}" /bin/sh -c "mariabackup --host mysql --user root --password ${DBROOT} \
--backup --rsync --target-dir=/var/lib/mysql/tmp_backup ; \
mariabackup --prepare --target-dir=/var/lib/mysql/tmp_backup ; \
chown -R 999:999 /var/lib/mysql/tmp_backup ;" > /dev/null 2>&1
Expand All @@ -160,11 +162,11 @@ fi
# backup database: redis
echo "--- redis-dump"
redis_id=$(docker ps -qf name=redis-mailcow)
redis_dump=$(docker exec $redis_id redis-cli save)
redis_dump=$(docker exec "$redis_id" redis-cli save)
if [[ "$redis_dump" == "OK" ]]; then
echo "---- success"
else
echo "---- FAILED: $redisdump"
echo "---- FAILED: $redis_dump"
fi


Expand All @@ -178,8 +180,8 @@ echo
echo "-- start syncing files"
echo

thisDir="$( cd $( dirname ${BASH_SOURCE[0]} ) >/dev/null 2>&1 && pwd )"
thisFile="$(basename ${0})"
thisDir="$( cd "$( dirname "${BASH_SOURCE[0]}" )" >/dev/null 2>&1 && pwd )"
thisFile="$(basename "${0}")"

borg create \
--show-rc \
Expand Down
39 changes: 20 additions & 19 deletions restore.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,18 +1,19 @@
#!/bin/bash

###############################
# #
# Mailcow Borg Restore #
# #
###############################
# Author: Matthis B. #
# Created: 20201106 #
# Lastchange: 20201107 #
###############################
# Changelog: #
# - 20201106: init #
# - 20201107: small changes #
###############################
########################################
# #
# Mailcow Borg Restore #
# #
########################################
# Author: Matthis B. #
# Created: 20201106 #
# Lastchange: 20201129 #
########################################
# Changelog: #
# - 20201106: init #
# - 20201107: small changes #
# - 20201129: fix shellcheck warnings #
########################################

#
# Settings
Expand Down Expand Up @@ -72,37 +73,37 @@ echo "- start restoring data"
echo
echo "-- vmail"
echo "--- ${restoreVolumesFrom}${restoreVolumesTo}/${dirnameVMail}/ -> ${restoreVolumesTo}/${dirnameVMail}/"
rm -rf "${restoreVolumesTo}/${dirnameVMail}/"*
rm -rf "${restoreVolumesTo:?}/${dirnameVMail}/"*
rsync -axh --stats "${restoreVolumesFrom}${restoreVolumesTo}/${dirnameVMail}/" "${restoreVolumesTo}/${dirnameVMail}/"

echo
echo "-- crypt"
echo "--- ${restoreVolumesFrom}${restoreVolumesTo}/${dirnameCrypt}/ -> ${restoreVolumesTo}/${dirnameCrypt}/"
rm -rf "${restoreVolumesTo}/${dirnameCrypt}/"*
rm -rf "${restoreVolumesTo:?}/${dirnameCrypt}/"*
rsync -axh --stats "${restoreVolumesFrom}${restoreVolumesTo}/${dirnameCrypt}/" "${restoreVolumesTo}/${dirnameCrypt}/"

echo
echo "-- redis"
echo "--- ${restoreVolumesFrom}${restoreVolumesTo}/${dirnameRedis}/ -> ${restoreVolumesTo}/${dirnameRedis}/"
rm -rf "${restoreVolumesTo}/${dirnameRedis}/"*
rm -rf "${restoreVolumesTo:?}/${dirnameRedis}/"*
rsync -axh --stats "${restoreVolumesFrom}${restoreVolumesTo}/${dirnameRedis}/" "${restoreVolumesTo}/${dirnameRedis}/"

echo
echo "-- rspamd"
echo "--- ${restoreVolumesFrom}${restoreVolumesTo}/${dirnameRSpamd}/ -> ${restoreVolumesTo}/${dirnameRSpamd}/"
rm -rf "${restoreVolumesTo}/${dirnameRSpamd}/"*
rm -rf "${restoreVolumesTo:?}/${dirnameRSpamd}/"*
rsync -axh --stats "${restoreVolumesFrom}${restoreVolumesTo}/${dirnameRSpamd}/" "${restoreVolumesTo}/${dirnameRSpamd}/"

echo
echo "-- postfix"
echo "--- ${restoreVolumesFrom}${restoreVolumesTo}/${dirnamePostfix}/ -> ${restoreVolumesTo}/${dirnamePostfix}/"
rm -rf "${restoreVolumesTo}/${dirnamePostfix}/"*
rm -rf "${restoreVolumesTo:?}/${dirnamePostfix}/"*
rsync -axh --stats "${restoreVolumesFrom}${restoreVolumesTo}/${dirnamePostfix}/" "${restoreVolumesTo}/${dirnamePostfix}/"

echo
echo "-- mysql"
echo "--- ${restoreVolumesFrom}${restoreVolumesTo}/${dirnameMySQL}/_data/tmp_backup/ -> ${restoreVolumesTo}/${dirnameMySQL}/_data/"
rm -rf "${restoreVolumesTo}/${dirnameMySQL}/"*
rm -rf "${restoreVolumesTo:?}/${dirnameMySQL}/"*
rsync -axh --stats "${restoreVolumesFrom}${restoreVolumesTo}/${dirnameMySQL}/_data/tmp_backup/" "${restoreVolumesTo}/${dirnameMySQL}/_data/"

echo
Expand Down