From ac7a897f10d60985cb9cd99c444a238582ba6d68 Mon Sep 17 00:00:00 2001 From: Michael Stanclift Date: Sat, 11 Jul 2020 08:50:32 -0500 Subject: [PATCH 1/3] 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 From 4eacab6fa7bf9cda8b40d23ec11f74d247449715 Mon Sep 17 00:00:00 2001 From: Michael Stanclift Date: Sat, 11 Jul 2020 08:53:04 -0500 Subject: [PATCH 2/3] 2.1.1 --- ADVANCED.md | 4 ++-- CHANGELOG.md | 3 +++ VERSION | 2 +- gravity-sync.sh | 2 +- 4 files changed, 7 insertions(+), 4 deletions(-) diff --git a/ADVANCED.md b/ADVANCED.md index 318f5a6..edf8fab 100644 --- a/ADVANCED.md +++ b/ADVANCED.md @@ -14,8 +14,8 @@ Download the latest release from [GitHub](https://github.com/vmstan/gravity-sync ```bash cd ~ -wget https://github.com/vmstan/gravity-sync/archive/v2.1.0.zip -unzip v2.1.0.zip -d gravity-sync +wget https://github.com/vmstan/gravity-sync/archive/v2.1.1.zip +unzip v2.1.1.zip -d gravity-sync cd gravity-sync ``` diff --git a/CHANGELOG.md b/CHANGELOG.md index b91cd9c..aeaa724 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -19,6 +19,9 @@ Support for the the Dropbear SSH client/server (which was added in 1.7.6) will b 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.1.1 +- Last release was incorrectly published without logic to ignore `custom.list` if request or not used. + ## 2.0 ### The Smart Release diff --git a/VERSION b/VERSION index 50aea0e..7c32728 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -2.1.0 \ No newline at end of file +2.1.1 \ No newline at end of file diff --git a/gravity-sync.sh b/gravity-sync.sh index e211fb6..5e6d141 100755 --- a/gravity-sync.sh +++ b/gravity-sync.sh @@ -3,7 +3,7 @@ SCRIPT_START=$SECONDS # GRAVITY SYNC BY VMSTAN ##################### PROGRAM='Gravity Sync' -VERSION='2.1.0' +VERSION='2.1.1' # Execute from the home folder of the user who owns it (ex: 'cd ~/gravity-sync') # For documentation or downloading updates visit https://github.com/vmstan/gravity-sync From 39aea0d602d9025e60bab4bd56c154665b699550 Mon Sep 17 00:00:00 2001 From: Michael Stanclift Date: Sat, 11 Jul 2020 10:04:40 -0500 Subject: [PATCH 3/3] 2.1.2 --- ADVANCED.md | 4 ++-- CHANGELOG.md | 3 +++ VERSION | 2 +- gravity-sync.sh | 4 ++-- 4 files changed, 8 insertions(+), 5 deletions(-) diff --git a/ADVANCED.md b/ADVANCED.md index edf8fab..0e46f01 100644 --- a/ADVANCED.md +++ b/ADVANCED.md @@ -14,8 +14,8 @@ Download the latest release from [GitHub](https://github.com/vmstan/gravity-sync ```bash cd ~ -wget https://github.com/vmstan/gravity-sync/archive/v2.1.1.zip -unzip v2.1.1.zip -d gravity-sync +wget https://github.com/vmstan/gravity-sync/archive/v2.1.2.zip +unzip v2.1.2.zip -d gravity-sync cd gravity-sync ``` diff --git a/CHANGELOG.md b/CHANGELOG.md index aeaa724..2a10d90 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -22,6 +22,9 @@ The `./gravity-sync.sh update` and `version` functions will look for the `dbclie #### 2.1.1 - Last release was incorrectly published without logic to ignore `custom.list` if request or not used. +#### 2.1.2 +- Corrects a bug in `backup` automation that causes the backup to run every minute during the hour selected. + ## 2.0 ### The Smart Release diff --git a/VERSION b/VERSION index 7c32728..8f9174b 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -2.1.1 \ No newline at end of file +2.1.2 \ No newline at end of file diff --git a/gravity-sync.sh b/gravity-sync.sh index 5e6d141..b0980ea 100755 --- a/gravity-sync.sh +++ b/gravity-sync.sh @@ -3,7 +3,7 @@ SCRIPT_START=$SECONDS # GRAVITY SYNC BY VMSTAN ##################### PROGRAM='Gravity Sync' -VERSION='2.1.1' +VERSION='2.1.2' # Execute from the home folder of the user who owns it (ex: 'cd ~/gravity-sync') # For documentation or downloading updates visit https://github.com/vmstan/gravity-sync @@ -1567,7 +1567,7 @@ function task_automate { else MESSAGE="Saving New Backup Automation" echo_stat - (crontab -l 2>/dev/null; echo "* ${INPUT_AUTO_BACKUP} * * * ${BASH_PATH} $HOME/${LOCAL_FOLDR}/${GS_FILENAME} backup >/dev/null 2>&1") | crontab - + (crontab -l 2>/dev/null; echo "0 ${INPUT_AUTO_BACKUP} * * * ${BASH_PATH} $HOME/${LOCAL_FOLDR}/${GS_FILENAME} backup >/dev/null 2>&1") | crontab - error_validate fi