From 0a16a3f2e7568f60aad8f14deb64bbf9de1e4826 Mon Sep 17 00:00:00 2001 From: Niklas Date: Thu, 1 Jul 2021 00:04:44 +0200 Subject: [PATCH] fixed script --- entrypoint.sh | 22 +++++++++++----------- init.sh | 11 ++++++----- 2 files changed, 17 insertions(+), 16 deletions(-) diff --git a/entrypoint.sh b/entrypoint.sh index a112d1d..180a998 100755 --- a/entrypoint.sh +++ b/entrypoint.sh @@ -1,32 +1,32 @@ -#!/bin/sh +#!/use/bin/env sh set -e [ -z "${RCLONE_REMOTE}" ] && echo "\$RCLONE_REMOTE is not set" && exit 1 [ -z "${RCLONE_CONFIG}" ] && echo "\$RCLONE_CONFIG is not set" && exit 1 -if [ -z "${ENC_PASSWORD}" ] -then +if [ -z "${ENC_PASSWORD}" ]; then RESTIC_PASSWORD="${ENC_PASSWORD}" -else if [ -z "${ENC_PASSWORD_FILE}" ] - RESTIC_PASSWORD=$(cat $ENC_PASSWORD_FILE) +elif [ -z "${ENC_PASSWORD_FILE}" ]; then + RESTIC_PASSWORD=$(cat "$ENC_PASSWORD_FILE") else echo "\$ENC_PASSWORD or \$ENC_PASSWORD_FILE is not set" && exit 1 fi -if [ -z "${MYSQL_PASSWORD}" ] -then +if [ -z "${MYSQL_PASSWORD}" ]; then MYSQL_PASSWORD_ACTUAL="${MYSQL_PASSWORD}" -else if [ -z "${MYSQL_PASSWORD_FILE}" ] - MYSQL_PASSWORD_ACTUAL=$(cat $MYSQL_PASSWORD_FILE) +elif [ -z "${MYSQL_PASSWORD_FILE}" ]; then + MYSQL_PASSWORD_ACTUAL=$(cat "$MYSQL_PASSWORD_FILE") fi mkdir -p /backup/sqlDump -for db in ${MYSQL_DUMP_DB//,/ } +for db in $(echo "$MYSQL_DUMP_DB" | sed 's/,/\n/g') do echo "Dumping db: $db" - mysqldump --compact -P 3306 --host $MYSQL_HOST -u "$MYSQL_USERNAME" "-p$MYSQL_PASSWORD_ACTUAL" "$db" > "/backup/sqlDump/$db.sql" + mysqldump --compact -P 3306 --host "$MYSQL_HOST" -u "$MYSQL_USERNAME" "-p$MYSQL_PASSWORD_ACTUAL" "$db" > "/backup/sqlDump/$db.sql" done +export RESTIC_PASSWORD + restic -r "rclone:$RCLONE_REMOTE" --verbose backup "/backup" diff --git a/init.sh b/init.sh index 189f5de..0663fa1 100755 --- a/init.sh +++ b/init.sh @@ -1,21 +1,22 @@ -#!/bin/sh +#!/usr/bin/env sh set -e [ -z "${RCLONE_REMOTE}" ] && echo "\$RCLONE_REMOTE is not set" && exit 1 [ -z "${RCLONE_CONFIG}" ] && echo "\$RCLONE_CONFIG is not set" && exit 1 -if [ -z "${ENC_PASSWORD}" ] -then +if [ -z "${ENC_PASSWORD}" ]; then RESTIC_PASSWORD="${ENC_PASSWORD}" -else if [ -z "${ENC_PASSWORD_FILE}" ] - RESTIC_PASSWORD=$(cat $ENC_PASSWORD_FILE) +elif [ -z "${ENC_PASSWORD_FILE}" ]; then + RESTIC_PASSWORD=$(cat "$ENC_PASSWORD_FILE") else echo "\$ENC_PASSWORD or \$ENC_PASSWORD_FILE is not set" && exit 1 fi echo "Init new repo" +export RESTIC_PASSWORD + restic -r "rclone:$RCLONE_REMOTE" init echo "Created new repo at $RCLONE_REMOTE"