From ac7a897f10d60985cb9cd99c444a238582ba6d68 Mon Sep 17 00:00:00 2001 From: Michael Stanclift Date: Sat, 11 Jul 2020 08:50:32 -0500 Subject: [PATCH] 2.0.1 --- CHANGELOG.md | 2 +- gravity-sync.sh | 14 ++++++++++---- 2 files changed, 11 insertions(+), 5 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 750e6a7..b91cd9c 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -17,7 +17,7 @@ It's suggested to make sure your local restore was successful before completing Support for the the Dropbear SSH client/server (which was added in 1.7.6) will be removed in an upcoming version of Gravity Sync. If you are using this instead of OpenSSH (common with DietPi) please reconfigure your installation to use OpenSSH. You will want to delete your existing `~/.ssh/id_rsa` and `~/.ssh/id_rsa.pub` files and run `./gravity-sync.sh configure` again to generate a new key and copy it to the primary Pi-hole. -The `./gravity-sync.sh update` and `version` functions will look for the `dbclient` binary on the local system and warn users to change. +The `./gravity-sync.sh update` and `version` functions will look for the `dbclient` binary on the local system and warn users about the upcoming changes. ## 2.0 ### The Smart Release diff --git a/gravity-sync.sh b/gravity-sync.sh index 4cf0328..e211fb6 100755 --- a/gravity-sync.sh +++ b/gravity-sync.sh @@ -1701,11 +1701,17 @@ function task_backup { sqlite3 ${PIHOLE_DIR}/${GRAVITY_FI} ".backup '$HOME/${LOCAL_FOLDR}/${BACKUP_FOLD}/${BACKUPTIMESTAMP}-${GRAVITY_FI}.backup'" error_validate - MESSAGE="Performing Backup Up ${CUSTOM_DNS}" - echo_stat + if [ "$SKIP_CUSTOM" != '1' ] + then + if [ -f ${PIHOLE_DIR}/${CUSTOM_DNS} ] + then + MESSAGE="Performing Backup Up ${CUSTOM_DNS}" + echo_stat - cp ${PIHOLE_DIR}/${CUSTOM_DNS} $HOME/${LOCAL_FOLDR}/${BACKUP_FOLD}/${BACKUPTIMESTAMP}-${CUSTOM_DNS}.backup - error_validate + cp ${PIHOLE_DIR}/${CUSTOM_DNS} $HOME/${LOCAL_FOLDR}/${BACKUP_FOLD}/${BACKUPTIMESTAMP}-${CUSTOM_DNS}.backup + error_validate + fi + fi MESSAGE="Cleaning Up Old Backups" echo_stat