From 5186f543c4913d1090a90aaeaa930954fd3d3fa1 Mon Sep 17 00:00:00 2001 From: aschamberger Date: Mon, 29 Jul 2019 22:16:05 +0200 Subject: [PATCH 1/2] fix name option --- remote-backup/run.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/remote-backup/run.sh b/remote-backup/run.sh index 4f2caed..6ff4b9c 100755 --- a/remote-backup/run.sh +++ b/remote-backup/run.sh @@ -57,7 +57,7 @@ function delete-local-backup { : elif [[ -z ${KEEP_LOCAL_BACKUP} ]]; then echo "Deleting local backup: ${slug}" - hassio snapshots remove -name "${slug}" + hassio snapshots remove --name "${slug}" else last_date_to_keep=$(hassio snapshots list | jq .data.snapshots[].date | sort -r | \ @@ -66,7 +66,7 @@ function delete-local-backup { hassio snapshots list | jq -c .data.snapshots[] | while read backup; do if [[ $(echo ${backup} | jq .date | xargs date -D "%Y-%m-%dT%T" +%s --date ) -lt ${last_date_to_keep} ]]; then echo "Deleting local backup: $(echo ${backup} | jq -r .slug)" - hassio snapshots remove -name "$(echo ${backup} | jq -r .slug)" + hassio snapshots remove --name "$(echo ${backup} | jq -r .slug)" fi done From 263d81419654c058fec42fdb0e9b83bf2a9c415b Mon Sep 17 00:00:00 2001 From: aschamberger Date: Mon, 29 Jul 2019 22:31:02 +0200 Subject: [PATCH 2/2] implement https://github.com/overkill32/hassio-remote-backup/issues/12 --- remote-backup/run.sh | 17 +++++++---------- 1 file changed, 7 insertions(+), 10 deletions(-) diff --git a/remote-backup/run.sh b/remote-backup/run.sh index 6ff4b9c..cc8d160 100755 --- a/remote-backup/run.sh +++ b/remote-backup/run.sh @@ -38,15 +38,8 @@ function add-ssh-key { function copy-backup-to-remote { cd /backup/ - if [[ -z $ZIP_PASSWORD ]]; then - echo "Copying ${slug}.tar to ${REMOTE_DIRECTORY} on ${SSH_HOST} using SCP" - scp -F "${HOME}/.ssh/config" "${slug}.tar" remote:"${REMOTE_DIRECTORY}" - else - echo "Copying password-protected ${slug}.zip to ${REMOTE_DIRECTORY} on ${SSH_HOST} using SCP" - zip -P "$ZIP_PASSWORD" "${slug}.zip" "${slug}".tar - scp -F "${HOME}/.ssh/config" "${slug}.zip" remote:"${REMOTE_DIRECTORY}" && rm "${slug}.zip" - fi - + echo "Copying ${slug}.tar to ${REMOTE_DIRECTORY} on ${SSH_HOST} using SCP" + scp -F "${HOME}/.ssh/config" "${slug}.tar" remote:"${REMOTE_DIRECTORY}" } function delete-local-backup { @@ -76,7 +69,11 @@ function delete-local-backup { function create-local-backup { name="Automated backup $(date +'%Y-%m-%d %H:%M')" echo "Creating local backup: \"${name}\"" - slug=$(hassio snapshots new --name="${name}" | jq --raw-output '.data.slug') + if [[ -z $ZIP_PASSWORD ]]; then + slug=$(hassio snapshots new --name="${name}" | jq --raw-output '.data.slug') + else + slug=$(hassio snapshots new --name="${name}" --password="${ZIP_PASSWORD}" | jq --raw-output '.data.slug') + fi echo "Backup created: ${slug}" }