From 4cb9e4e6ea426641016a3a306395f4f0107383da Mon Sep 17 00:00:00 2001
From: Daniel Hornung <daniel@harvey.fritz.box>
Date: Tue, 4 Jun 2019 12:30:55 +0200
Subject: [PATCH] FIX: Fixed YAML in backup.sh
---
backup.sh | 29 +++++++++++++++++++++++------
1 file changed, 23 insertions(+), 6 deletions(-)
diff --git a/backup.sh b/backup.sh
index 3cfbb13..848c891 100755
--- a/backup.sh
+++ b/backup.sh
@@ -39,8 +39,8 @@ PRINT_HELP="--backupdir=BACKUPDIR\n\tThe directory which the dump is to be store
YAMLFAIL=$(cat << "EOF"
#### YAML ####
error:
- - code: $error_code
- - message: $error_message
+ code: $error_code
+ message: $error_message
#### YAML END ####
EOF
)
@@ -48,11 +48,11 @@ EOF
YAMLSUCCESS=$(cat << "EOF"
#### YAML ####
error:
- - code: 0
- - message: Backup successfully created
+ code: 0
+ message: Backup successfully created
backup:
- - location: $file_location
- - date: $date
+ location: $file_location
+ date: $date
#### YAML END ####
EOF
)
@@ -109,6 +109,23 @@ function yaml_success() {
DATE=$(date -u --rfc-3339=ns | sed 's/ /T/g')
BACKUPFILE=${BACKUPDIR}/${DATABASE_NAME}.${DATE}.dump.sql
+
+#YAMLSUCCESS=$(cat <<"EOF"
+read -r -d '' YAMLSUCCESS <<"EOF" || true
+#### YAML ####
+error:
+ code: 0
+ message: Backup successfully created
+backup:
+ location: $file_location
+ date: $date
+#### YAML END ####
+EOF
+
+echo "YAMLSUCCESS:"
+echo "$YAMLSUCCESS"
+
+
backup $DATABASE_NAME $BACKUPFILE
--
GitLab